Skip to content

Commit fa1a25c

Browse files
committed
PCI: PM: Do not call platform_pci_power_manageable() unnecessarily
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 <[email protected]> Tested-by: Ferry Toth <[email protected]>
1 parent 6407e5e commit fa1a25c

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

drivers/pci/pci.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,9 +1191,7 @@ void pci_update_current_state(struct pci_dev *dev, pci_power_t state)
11911191
*/
11921192
void pci_refresh_power_state(struct pci_dev *dev)
11931193
{
1194-
if (platform_pci_power_manageable(dev))
1195-
platform_pci_refresh_power_state(dev);
1196-
1194+
platform_pci_refresh_power_state(dev);
11971195
pci_update_current_state(dev, dev->current_state);
11981196
}
11991197

@@ -1206,14 +1204,10 @@ int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state)
12061204
{
12071205
int error;
12081206

1209-
if (platform_pci_power_manageable(dev)) {
1210-
error = platform_pci_set_power_state(dev, state);
1211-
if (!error)
1212-
pci_update_current_state(dev, state);
1213-
} else
1214-
error = -ENODEV;
1215-
1216-
if (error && !dev->pm_cap) /* Fall back to PCI_D0 */
1207+
error = platform_pci_set_power_state(dev, state);
1208+
if (!error)
1209+
pci_update_current_state(dev, state);
1210+
else if (!dev->pm_cap) /* Fall back to PCI_D0 */
12171211
dev->current_state = PCI_D0;
12181212

12191213
return error;

0 commit comments

Comments
 (0)