diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-04-28 18:36:32 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-04-28 18:36:32 -0400 |
commit | 8b313a38ecffc0ff0b4c5115f0a461f73b7dfdb6 (patch) | |
tree | f0e9501dc9d8353736e4824443f7bb603042a076 /drivers/base/platform.c | |
parent | 38ade3a1fa0421c12627c7b48c33e89414fc9b76 (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/platform.c')
-rw-r--r-- | drivers/base/platform.c | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 313556f28c9e..079c18a5e471 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
@@ -900,35 +900,10 @@ int platform_pm_restore_noirq(struct device *dev) | |||
900 | 900 | ||
901 | #endif /* CONFIG_HIBERNATE_CALLBACKS */ | 901 | #endif /* CONFIG_HIBERNATE_CALLBACKS */ |
902 | 902 | ||
903 | #ifdef CONFIG_PM_RUNTIME | ||
904 | |||
905 | int __weak platform_pm_runtime_suspend(struct device *dev) | ||
906 | { | ||
907 | return pm_generic_runtime_suspend(dev); | ||
908 | }; | ||
909 | |||
910 | int __weak platform_pm_runtime_resume(struct device *dev) | ||
911 | { | ||
912 | return pm_generic_runtime_resume(dev); | ||
913 | }; | ||
914 | |||
915 | int __weak platform_pm_runtime_idle(struct device *dev) | ||
916 | { | ||
917 | return pm_generic_runtime_idle(dev); | ||
918 | }; | ||
919 | |||
920 | #else /* !CONFIG_PM_RUNTIME */ | ||
921 | |||
922 | #define platform_pm_runtime_suspend NULL | ||
923 | #define platform_pm_runtime_resume NULL | ||
924 | #define platform_pm_runtime_idle NULL | ||
925 | |||
926 | #endif /* !CONFIG_PM_RUNTIME */ | ||
927 | |||
928 | static const struct dev_pm_ops platform_dev_pm_ops = { | 903 | static const struct dev_pm_ops platform_dev_pm_ops = { |
929 | .runtime_suspend = platform_pm_runtime_suspend, | 904 | .runtime_suspend = pm_generic_runtime_suspend, |
930 | .runtime_resume = platform_pm_runtime_resume, | 905 | .runtime_resume = pm_generic_runtime_resume, |
931 | .runtime_idle = platform_pm_runtime_idle, | 906 | .runtime_idle = pm_generic_runtime_idle, |
932 | USE_PLATFORM_PM_SLEEP_OPS | 907 | USE_PLATFORM_PM_SLEEP_OPS |
933 | }; | 908 | }; |
934 | 909 | ||