Commit 81cfa590 authored Nov 05, 2019 by Rafael J. Wysocki Committed by Bjorn Helgaas Nov 20, 2019

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

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>

parent 1a1daf09

drivers/pci/pci-driver.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}

drivers/pci/pci.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**

Admin message