PCI/PM: Move power state update away from pci_power_up()

rafaeljw · bjorn-helgaas · commit 81cfa5908fd6 · 2019-11-20T17:35:34.000-06:00
Move the invocation of pci_update_current_state() from pci_power_up() to pci_pm_default_resume_early(), which is the only caller of that function. Preparatory change, no functional impact. Link: https://lore.kernel.org/r/37482337.udjOGdOKNb@kreacher Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
@@ -531,6 +531,7 @@ static void pci_pm_default_resume(struct pci_dev *pci_dev)
 static void pci_pm_default_resume_early(struct pci_dev *pci_dev)
 {
 	pci_power_up(pci_dev);
+	pci_update_current_state(pci_dev, PCI_D0);
 	pci_restore_state(pci_dev);
 	pci_pme_restore(pci_dev);
 }
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
@@ -1148,7 +1148,6 @@ void pci_power_up(struct pci_dev *dev)
 {
 	__pci_start_power_transition(dev, PCI_D0);
 	pci_raw_set_power_state(dev, PCI_D0);
-	pci_update_current_state(dev, PCI_D0);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -531,6 +531,7 @@ static void pci_pm_default_resume(struct pci_dev *pci_dev)`
`531`	`531`	`static void pci_pm_default_resume_early(struct pci_dev *pci_dev)`
`532`	`532`	`{`
`533`	`533`	`pci_power_up(pci_dev);`
	`534`	`+ pci_update_current_state(pci_dev, PCI_D0);`
`534`	`535`	`pci_restore_state(pci_dev);`
`535`	`536`	`pci_pme_restore(pci_dev);`
`536`	`537`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1148,7 +1148,6 @@ void pci_power_up(struct pci_dev *dev)`
`1148`	`1148`	`{`
`1149`	`1149`	`__pci_start_power_transition(dev, PCI_D0);`
`1150`	`1150`	`pci_raw_set_power_state(dev, PCI_D0);`
`1151`		`- pci_update_current_state(dev, PCI_D0);`
`1152`	`1151`	`}`
`1153`	`1152`
`1154`	`1153`	`/**`