diff options
-rw-r--r-- | drivers/watchdog/at91sam9_wdt.c | 19 | ||||
-rw-r--r-- | drivers/watchdog/iTCO_wdt.c | 5 | ||||
-rw-r--r-- | drivers/watchdog/sch311x_wdt.c | 5 |
3 files changed, 0 insertions, 29 deletions
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index eac26021e8da..5cfbcc55d88a 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c | |||
@@ -284,27 +284,8 @@ static int __exit at91wdt_remove(struct platform_device *pdev) | |||
284 | return res; | 284 | return res; |
285 | } | 285 | } |
286 | 286 | ||
287 | #ifdef CONFIG_PM | ||
288 | |||
289 | static int at91wdt_suspend(struct platform_device *pdev, pm_message_t message) | ||
290 | { | ||
291 | return 0; | ||
292 | } | ||
293 | |||
294 | static int at91wdt_resume(struct platform_device *pdev) | ||
295 | { | ||
296 | return 0; | ||
297 | } | ||
298 | |||
299 | #else | ||
300 | #define at91wdt_suspend NULL | ||
301 | #define at91wdt_resume NULL | ||
302 | #endif | ||
303 | |||
304 | static struct platform_driver at91wdt_driver = { | 287 | static struct platform_driver at91wdt_driver = { |
305 | .remove = __exit_p(at91wdt_remove), | 288 | .remove = __exit_p(at91wdt_remove), |
306 | .suspend = at91wdt_suspend, | ||
307 | .resume = at91wdt_resume, | ||
308 | .driver = { | 289 | .driver = { |
309 | .name = "at91_wdt", | 290 | .name = "at91_wdt", |
310 | .owner = THIS_MODULE, | 291 | .owner = THIS_MODULE, |
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 1190bf158f8e..751a591684da 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c | |||
@@ -923,15 +923,10 @@ static void iTCO_wdt_shutdown(struct platform_device *dev) | |||
923 | iTCO_wdt_stop(); | 923 | iTCO_wdt_stop(); |
924 | } | 924 | } |
925 | 925 | ||
926 | #define iTCO_wdt_suspend NULL | ||
927 | #define iTCO_wdt_resume NULL | ||
928 | |||
929 | static struct platform_driver iTCO_wdt_driver = { | 926 | static struct platform_driver iTCO_wdt_driver = { |
930 | .probe = iTCO_wdt_probe, | 927 | .probe = iTCO_wdt_probe, |
931 | .remove = __devexit_p(iTCO_wdt_remove), | 928 | .remove = __devexit_p(iTCO_wdt_remove), |
932 | .shutdown = iTCO_wdt_shutdown, | 929 | .shutdown = iTCO_wdt_shutdown, |
933 | .suspend = iTCO_wdt_suspend, | ||
934 | .resume = iTCO_wdt_resume, | ||
935 | .driver = { | 930 | .driver = { |
936 | .owner = THIS_MODULE, | 931 | .owner = THIS_MODULE, |
937 | .name = DRV_NAME, | 932 | .name = DRV_NAME, |
diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c index c7cf4b01f58d..029467e34636 100644 --- a/drivers/watchdog/sch311x_wdt.c +++ b/drivers/watchdog/sch311x_wdt.c | |||
@@ -472,15 +472,10 @@ static void sch311x_wdt_shutdown(struct platform_device *dev) | |||
472 | sch311x_wdt_stop(); | 472 | sch311x_wdt_stop(); |
473 | } | 473 | } |
474 | 474 | ||
475 | #define sch311x_wdt_suspend NULL | ||
476 | #define sch311x_wdt_resume NULL | ||
477 | |||
478 | static struct platform_driver sch311x_wdt_driver = { | 475 | static struct platform_driver sch311x_wdt_driver = { |
479 | .probe = sch311x_wdt_probe, | 476 | .probe = sch311x_wdt_probe, |
480 | .remove = __devexit_p(sch311x_wdt_remove), | 477 | .remove = __devexit_p(sch311x_wdt_remove), |
481 | .shutdown = sch311x_wdt_shutdown, | 478 | .shutdown = sch311x_wdt_shutdown, |
482 | .suspend = sch311x_wdt_suspend, | ||
483 | .resume = sch311x_wdt_resume, | ||
484 | .driver = { | 479 | .driver = { |
485 | .owner = THIS_MODULE, | 480 | .owner = THIS_MODULE, |
486 | .name = DRV_NAME, | 481 | .name = DRV_NAME, |