diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-05 20:05:15 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-05-05 14:19:48 -0500 |
| commit | 6d8c016a55aca612802fc325eb0e659d1c5f255d (patch) | |
| tree | 23ac717e899933b43433ac2d438a63e314c757bb /drivers/pci/pci.c | |
| parent | 1aa85bb14d8ed0ae4238617061924032c80dad37 (diff) | |
| download | linux-6d8c016a55aca612802fc325eb0e659d1c5f255d.tar.bz2 | |
PCI/PM: Unfold pci_platform_power_transition() in pci_power_up()
Some actions carried out by pci_platform_power_transition(() in
pci_power_up() are redundant, but before dealing with them, make
pci_power_up() call the pci_platform_power_transition() code directly
(and avoid a redundant check when pm_cap is unset while at it).
Link: https://lore.kernel.org/r/1922486.PYKUYFuaPT@kreacher
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 056e8284b5fd..bc4af86da3f9 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1194,8 +1194,15 @@ int pci_power_up(struct pci_dev *dev) { bool need_restore = false; u16 pmcsr; + int ret; - pci_platform_power_transition(dev, PCI_D0); + ret = platform_pci_set_power_state(dev, PCI_D0); + if (!ret) { + pci_update_current_state(dev, PCI_D0); + } else if (!dev->pm_cap) { /* Fall back to PCI_D0 */ + dev->current_state = PCI_D0; + return 0; + } if (dev->current_state == PCI_D0) return 0; |