From: Rafael J. Wysocki Date: Wed, 7 Jan 2009 12:06:10 +0000 (+0100) Subject: PCI PM: Move pci_has_legacy_pm_support X-Git-Tag: v2.6.29-rc1~181^2~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=07e836e8d1f3688311d97fe1bf46980b0f9ae9c1;p=linux-2.6-omap-h63xx.git PCI PM: Move pci_has_legacy_pm_support Move pci_has_legacy_pm_support() closer to the functions that call it. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Jesse Barnes --- diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 2617ebb34e1..bfaa77d8853 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -314,14 +314,6 @@ static void pci_device_shutdown(struct device *dev) #ifdef CONFIG_PM_SLEEP -static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev) -{ - struct pci_driver *drv = pci_dev->driver; - - return drv && (drv->suspend || drv->suspend_late || drv->resume - || drv->resume_early); -} - /* * Default "suspend" method for devices that have no driver provided suspend, * or not even a driver at all (first part). @@ -458,6 +450,14 @@ static void pci_pm_default_suspend(struct pci_dev *pci_dev) pci_prepare_to_sleep(pci_dev); } +static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev) +{ + struct pci_driver *drv = pci_dev->driver; + + return drv && (drv->suspend || drv->suspend_late || drv->resume + || drv->resume_early); +} + /* New power management framework */ static int pci_pm_prepare(struct device *dev)