[PATCH v2 6/7] PCI: PM: Do not call platform_pci_power_manageable() unnecessarily
From: Rafael J. Wysocki <hidden>
Date: 2021-09-20 19:20:14
Also in:
linux-acpi, lkml
From: Rafael J. Wysocki <redacted>
Drop two invocations of platform_pci_power_manageable() that are not
necessary, because the functions called when it returns 'true' do the
requisite "power manageable" checks themselves.
Signed-off-by: Rafael J. Wysocki <redacted>
---
v1 -> v2:
* Rebase on top of the new [1-5/7].
* Move the acpi_pci_power_manageable() simplification to a separate
patch.
* Change the subject.
---
Index: linux-pm/drivers/pci/pci.c
===================================================================--- linux-pm.orig/drivers/pci/pci.c
+++ linux-pm/drivers/pci/pci.c@@ -1191,9 +1191,7 @@ void pci_update_current_state(struct pci */ void pci_refresh_power_state(struct pci_dev *dev) { - if (platform_pci_power_manageable(dev)) - platform_pci_refresh_power_state(dev); - + platform_pci_refresh_power_state(dev); pci_update_current_state(dev, dev->current_state); }
@@ -1206,14 +1204,10 @@ int pci_platform_power_transition(struct { int error; - if (platform_pci_power_manageable(dev)) { - error = platform_pci_set_power_state(dev, state); - if (!error) - pci_update_current_state(dev, state); - } else - error = -ENODEV; - - if (error && !dev->pm_cap) /* Fall back to PCI_D0 */ + error = acpi_pci_set_power_state(dev, state); + if (!error) + pci_update_current_state(dev, state); + else if (!dev->pm_cap) /* Fall back to PCI_D0 */ dev->current_state = PCI_D0; return error;