Commit fa1a25c5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: default avatarFerry Toth <fntoth@gmail.com>
parent 6407e5ec

drivers/pci/pci.c

+5 −11
Original line number Diff line number Diff line
@@ -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);



	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 */

	else if (!dev->pm_cap) /* Fall back to PCI_D0 */

		dev->current_state = PCI_D0;



	return error;