aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-12-17 18:34:24 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2011-12-21 16:01:14 -0500
commit9b39e73d0c2b265a7f8748b0e9a9f09be84079a8 (patch)
tree5d05e904b4f67724908f6a5dec5bfdedae2ea7cb /include
parent35cd133c6130c1eb52806808abee9d62e6854a27 (diff)
PM / Sleep: Remove forward-only callbacks from platform bus type
The forward-only PM callbacks provided by the platform bus type are not necessary any more, because the PM core executes driver callbacks when the corresponding subsystem callbacks are not present, so drop them. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'include')
-rw-r--r--include/linux/platform_device.h30
1 files changed, 1 insertions, 29 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 2a23f7d1a825..b5267c951161 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -264,62 +264,34 @@ static inline char *early_platform_driver_setup_func(void) \
264} 264}
265#endif /* MODULE */ 265#endif /* MODULE */
266 266
267#ifdef CONFIG_PM_SLEEP
268extern int platform_pm_prepare(struct device *dev);
269extern void platform_pm_complete(struct device *dev);
270#else
271#define platform_pm_prepare NULL
272#define platform_pm_complete NULL
273#endif
274
275#ifdef CONFIG_SUSPEND 267#ifdef CONFIG_SUSPEND
276extern int platform_pm_suspend(struct device *dev); 268extern int platform_pm_suspend(struct device *dev);
277extern int platform_pm_suspend_noirq(struct device *dev);
278extern int platform_pm_resume(struct device *dev); 269extern int platform_pm_resume(struct device *dev);
279extern int platform_pm_resume_noirq(struct device *dev);
280#else 270#else
281#define platform_pm_suspend NULL 271#define platform_pm_suspend NULL
282#define platform_pm_resume NULL 272#define platform_pm_resume NULL
283#define platform_pm_suspend_noirq NULL
284#define platform_pm_resume_noirq NULL
285#endif 273#endif
286 274
287#ifdef CONFIG_HIBERNATE_CALLBACKS 275#ifdef CONFIG_HIBERNATE_CALLBACKS
288extern int platform_pm_freeze(struct device *dev); 276extern int platform_pm_freeze(struct device *dev);
289extern int platform_pm_freeze_noirq(struct device *dev);
290extern int platform_pm_thaw(struct device *dev); 277extern int platform_pm_thaw(struct device *dev);
291extern int platform_pm_thaw_noirq(struct device *dev);
292extern int platform_pm_poweroff(struct device *dev); 278extern int platform_pm_poweroff(struct device *dev);
293extern int platform_pm_poweroff_noirq(struct device *dev);
294extern int platform_pm_restore(struct device *dev); 279extern int platform_pm_restore(struct device *dev);
295extern int platform_pm_restore_noirq(struct device *dev);
296#else 280#else
297#define platform_pm_freeze NULL 281#define platform_pm_freeze NULL
298#define platform_pm_thaw NULL 282#define platform_pm_thaw NULL
299#define platform_pm_poweroff NULL 283#define platform_pm_poweroff NULL
300#define platform_pm_restore NULL 284#define platform_pm_restore NULL
301#define platform_pm_freeze_noirq NULL
302#define platform_pm_thaw_noirq NULL
303#define platform_pm_poweroff_noirq NULL
304#define platform_pm_restore_noirq NULL
305#endif 285#endif
306 286
307#ifdef CONFIG_PM_SLEEP 287#ifdef CONFIG_PM_SLEEP
308#define USE_PLATFORM_PM_SLEEP_OPS \ 288#define USE_PLATFORM_PM_SLEEP_OPS \
309 .prepare = platform_pm_prepare, \
310 .complete = platform_pm_complete, \
311 .suspend = platform_pm_suspend, \ 289 .suspend = platform_pm_suspend, \
312 .resume = platform_pm_resume, \ 290 .resume = platform_pm_resume, \
313 .freeze = platform_pm_freeze, \ 291 .freeze = platform_pm_freeze, \
314 .thaw = platform_pm_thaw, \ 292 .thaw = platform_pm_thaw, \
315 .poweroff = platform_pm_poweroff, \ 293 .poweroff = platform_pm_poweroff, \
316 .restore = platform_pm_restore, \ 294 .restore = platform_pm_restore,
317 .suspend_noirq = platform_pm_suspend_noirq, \
318 .resume_noirq = platform_pm_resume_noirq, \
319 .freeze_noirq = platform_pm_freeze_noirq, \
320 .thaw_noirq = platform_pm_thaw_noirq, \
321 .poweroff_noirq = platform_pm_poweroff_noirq, \
322 .restore_noirq = platform_pm_restore_noirq,
323#else 295#else
324#define USE_PLATFORM_PM_SLEEP_OPS 296#define USE_PLATFORM_PM_SLEEP_OPS
325#endif 297#endif