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

PCI: PM: Do not call platform_pci_power_manageable() unnecessarily

Browse Source 
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 <rafael.j.wysocki@intel.com>
Tested-by: Ferry Toth <fntoth@gmail.com>
This commit is contained in:
Rafael J. Wysocki 2021-09-29 20:15:06 +02:00
parent 6407e5ecdc
commit fa1a25c51d
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pci/pci.c
View File

@ -1191,9 +1191,7 @@ void pci_update_current_state(struct pci_dev *dev, pci_power_t state)
*/ */
void pci_refresh_power_state(struct pci_dev *dev) 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); pci_update_current_state(dev, dev->current_state);
} }
@ -1206,14 +1204,10 @@ int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state)
{ {
int error; int error;
if (platform_pci_power_manageable(dev)) { error = platform_pci_set_power_state(dev, state);
error = platform_pci_set_power_state(dev, state); if (!error)
if (!error) pci_update_current_state(dev, state);
pci_update_current_state(dev, state); else if (!dev->pm_cap) /* Fall back to PCI_D0 */
} else
error = -ENODEV;
if (error && !dev->pm_cap) /* Fall back to PCI_D0 */
dev->current_state = PCI_D0; dev->current_state = PCI_D0;
return error; return error;