[PATCH v1 04/11] PCI/PM: Unfold pci_platform_power_transition() in pci_power_up()

Rafael J. Wysocki
2022-05-05T18:31:59Z

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).

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/pci/pci.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

Index: linux-pm/drivers/pci/pci.c
===================================================================
--- linux-pm.orig/drivers/pci/pci.c
+++ linux-pm/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;