aboutsummaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-04-29 00:36:32 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2011-04-29 00:36:32 +0200
commit8b313a38ecffc0ff0b4c5115f0a461f73b7dfdb6 (patch)
treef0e9501dc9d8353736e4824443f7bb603042a076 /drivers/base
parent38ade3a1fa0421c12627c7b48c33e89414fc9b76 (diff)
PM / Platform: Use generic runtime PM callbacks directly
Once shmobile platforms have been converted to using power domains for overriding the platform bus type's PM callbacks, it isn't necessary to use the __weakly defined wrappers around the generinc runtime PM callbacks in the platform bus type any more. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c31
1 files changed, 3 insertions, 28 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 313556f28c9..079c18a5e47 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -900,35 +900,10 @@ int platform_pm_restore_noirq(struct device *dev)
#endif /* CONFIG_HIBERNATE_CALLBACKS */
-#ifdef CONFIG_PM_RUNTIME
-
-int __weak platform_pm_runtime_suspend(struct device *dev)
-{
- return pm_generic_runtime_suspend(dev);
-};
-
-int __weak platform_pm_runtime_resume(struct device *dev)
-{
- return pm_generic_runtime_resume(dev);
-};
-
-int __weak platform_pm_runtime_idle(struct device *dev)
-{
- return pm_generic_runtime_idle(dev);
-};
-
-#else /* !CONFIG_PM_RUNTIME */
-
-#define platform_pm_runtime_suspend NULL
-#define platform_pm_runtime_resume NULL
-#define platform_pm_runtime_idle NULL
-
-#endif /* !CONFIG_PM_RUNTIME */
-
static const struct dev_pm_ops platform_dev_pm_ops = {
- .runtime_suspend = platform_pm_runtime_suspend,
- .runtime_resume = platform_pm_runtime_resume,
- .runtime_idle = platform_pm_runtime_idle,
+ .runtime_suspend = pm_generic_runtime_suspend,
+ .runtime_resume = pm_generic_runtime_resume,
+ .runtime_idle = pm_generic_runtime_idle,
USE_PLATFORM_PM_SLEEP_OPS
};