[1/5] PCI: PM: Move power state update away from pci_power_up()

Commit Message

Rafael J. Wysocki Nov. 5, 2019, 10:13 a.m. UTC

From: Rafael J. Wysocki <[e-mail]>

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.

Signed-off-by: Rafael J. Wysocki <[e-mail]>
---
 drivers/pci/pci-driver.c |    1 +
 drivers/pci/pci.c        |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

Patch

Index: linux-pm/drivers/pci/pci-driver.c
===================================================================
--- linux-pm.orig/drivers/pci/pci-driver.c
+++ linux-pm/drivers/pci/pci-driver.c
@@ -524,6 +524,7 @@  static int pci_restore_standard_config(s
 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);
 }
Index: linux-pm/drivers/pci/pci.c
===================================================================
--- linux-pm.orig/drivers/pci/pci.c
+++ linux-pm/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);
 }
 
 /**