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 <rafael.j.wysocki@intel.com>
Tested-by: Ferry Toth <fntoth@gmail.com>

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ae8fb60..b0409bd 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -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)
 {
-       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);
 }
 
@@ -1206,14 +1204,10 @@ int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state)
 {
        int error;
 
-       if (platform_pci_power_manageable(dev)) {
-               error = platform_pci_set_power_state(dev, state);
-               if (!error)
-                       pci_update_current_state(dev, state);
-       } else
-               error = -ENODEV;
-
-       if (error && !dev->pm_cap) /* Fall back to PCI_D0 */
+       error = platform_pci_set_power_state(dev, state);
+       if (!error)
+               pci_update_current_state(dev, state);
+       else if (!dev->pm_cap) /* Fall back to PCI_D0 */
                dev->current_state = PCI_D0;
 
        return error;