diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-01-07 07:06:10 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-07 14:15:31 -0500 |
commit | 07e836e8d1f3688311d97fe1bf46980b0f9ae9c1 (patch) | |
tree | 24dade02ec3e91868ab9e88d8b255f7725eab0b8 | |
parent | 571ff7584bb9e05fca0eb79752ae55a46faf3a98 (diff) |
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 <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r-- | drivers/pci/pci-driver.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 2617ebb34e14..bfaa77d88537 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) | |||
314 | 314 | ||
315 | #ifdef CONFIG_PM_SLEEP | 315 | #ifdef CONFIG_PM_SLEEP |
316 | 316 | ||
317 | static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev) | ||
318 | { | ||
319 | struct pci_driver *drv = pci_dev->driver; | ||
320 | |||
321 | return drv && (drv->suspend || drv->suspend_late || drv->resume | ||
322 | || drv->resume_early); | ||
323 | } | ||
324 | |||
325 | /* | 317 | /* |
326 | * Default "suspend" method for devices that have no driver provided suspend, | 318 | * Default "suspend" method for devices that have no driver provided suspend, |
327 | * or not even a driver at all (first part). | 319 | * or not even a driver at all (first part). |
@@ -458,6 +450,14 @@ static void pci_pm_default_suspend(struct pci_dev *pci_dev) | |||
458 | pci_prepare_to_sleep(pci_dev); | 450 | pci_prepare_to_sleep(pci_dev); |
459 | } | 451 | } |
460 | 452 | ||
453 | static bool pci_has_legacy_pm_support(struct pci_dev *pci_dev) | ||
454 | { | ||
455 | struct pci_driver *drv = pci_dev->driver; | ||
456 | |||
457 | return drv && (drv->suspend || drv->suspend_late || drv->resume | ||
458 | || drv->resume_early); | ||
459 | } | ||
460 | |||
461 | /* New power management framework */ | 461 | /* New power management framework */ |
462 | 462 | ||
463 | static int pci_pm_prepare(struct device *dev) | 463 | static int pci_pm_prepare(struct device *dev) |