Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

watchdog: remove empty pm-functions

While checking what watchdog drivers usually do in suspend/resume to
spot common behaviour for the watchdog framework, I found these drivers
which do nothing but add some cruft. Remove it, it is superfluous. New
approaches should probably be done with pm_ops anyway.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

authored by

Wolfram Sang and committed by
Wim Van Sebroeck
2fc5d52b 081d83a3

-29
-19
drivers/watchdog/at91sam9_wdt.c
··· 284 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 287 static struct platform_driver at91wdt_driver = { 305 288 .remove = __exit_p(at91wdt_remove), 306 - .suspend = at91wdt_suspend, 307 - .resume = at91wdt_resume, 308 289 .driver = { 309 290 .name = "at91_wdt", 310 291 .owner = THIS_MODULE,
-5
drivers/watchdog/iTCO_wdt.c
··· 923 923 iTCO_wdt_stop(); 924 924 } 925 925 926 - #define iTCO_wdt_suspend NULL 927 - #define iTCO_wdt_resume NULL 928 - 929 926 static struct platform_driver iTCO_wdt_driver = { 930 927 .probe = iTCO_wdt_probe, 931 928 .remove = __devexit_p(iTCO_wdt_remove), 932 929 .shutdown = iTCO_wdt_shutdown, 933 - .suspend = iTCO_wdt_suspend, 934 - .resume = iTCO_wdt_resume, 935 930 .driver = { 936 931 .owner = THIS_MODULE, 937 932 .name = DRV_NAME,
-5
drivers/watchdog/sch311x_wdt.c
··· 472 472 sch311x_wdt_stop(); 473 473 } 474 474 475 - #define sch311x_wdt_suspend NULL 476 - #define sch311x_wdt_resume NULL 477 - 478 475 static struct platform_driver sch311x_wdt_driver = { 479 476 .probe = sch311x_wdt_probe, 480 477 .remove = __devexit_p(sch311x_wdt_remove), 481 478 .shutdown = sch311x_wdt_shutdown, 482 - .suspend = sch311x_wdt_suspend, 483 - .resume = sch311x_wdt_resume, 484 479 .driver = { 485 480 .owner = THIS_MODULE, 486 481 .name = DRV_NAME,