leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI/PM: Unfold pci_platform_power_transition() in pci_power_up()

Browse Source 
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>
This commit is contained in:
Rafael J. Wysocki 2022-05-05 20:05:15 +02:00 committed by Bjorn Helgaas
parent 1aa85bb14d
commit 6d8c016a55
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/pci/pci.c
View File

@ -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;