BackPup/Linux
1
0 Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-07 05:31:08 -04:00
Code Issues 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 <[email protected]>
Signed-off-by: Bjorn Helgaas <[email protected]>
This commit is contained in:
Rafael J. Wysocki authored and Bjorn Helgaas committed 2022-05-05 14:19:48 -05:00
1 parent 1aa85bb14d
commit 6d8c016a55
1 file changed
+8 -1
Download Patch File Download Diff File Expand all files Collapse all files
drivers/pci/pci.c
+8 -1
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;