aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/iTCO_wdt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/watchdog/iTCO_wdt.c')
-rw-r--r--drivers/watchdog/iTCO_wdt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 545d387de411..6130321da387 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -364,7 +364,7 @@ static struct watchdog_device iTCO_wdt_watchdog_dev = {
364 * Init & exit routines 364 * Init & exit routines
365 */ 365 */
366 366
367static void __devexit iTCO_wdt_cleanup(void) 367static void iTCO_wdt_cleanup(void)
368{ 368{
369 /* Stop the timer before we leave */ 369 /* Stop the timer before we leave */
370 if (!nowayout) 370 if (!nowayout)
@@ -390,7 +390,7 @@ static void __devexit iTCO_wdt_cleanup(void)
390 iTCO_wdt_private.gcs = NULL; 390 iTCO_wdt_private.gcs = NULL;
391} 391}
392 392
393static int __devinit iTCO_wdt_probe(struct platform_device *dev) 393static int iTCO_wdt_probe(struct platform_device *dev)
394{ 394{
395 int ret = -ENODEV; 395 int ret = -ENODEV;
396 unsigned long val32; 396 unsigned long val32;
@@ -533,7 +533,7 @@ out:
533 return ret; 533 return ret;
534} 534}
535 535
536static int __devexit iTCO_wdt_remove(struct platform_device *dev) 536static int iTCO_wdt_remove(struct platform_device *dev)
537{ 537{
538 if (iTCO_wdt_private.tco_res || iTCO_wdt_private.smi_res) 538 if (iTCO_wdt_private.tco_res || iTCO_wdt_private.smi_res)
539 iTCO_wdt_cleanup(); 539 iTCO_wdt_cleanup();
@@ -548,7 +548,7 @@ static void iTCO_wdt_shutdown(struct platform_device *dev)
548 548
549static struct platform_driver iTCO_wdt_driver = { 549static struct platform_driver iTCO_wdt_driver = {
550 .probe = iTCO_wdt_probe, 550 .probe = iTCO_wdt_probe,
551 .remove = __devexit_p(iTCO_wdt_remove), 551 .remove = iTCO_wdt_remove,
552 .shutdown = iTCO_wdt_shutdown, 552 .shutdown = iTCO_wdt_shutdown,
553 .driver = { 553 .driver = {
554 .owner = THIS_MODULE, 554 .owner = THIS_MODULE,