diff options
Diffstat (limited to 'drivers/watchdog/sch311x_wdt.c')
| -rw-r--r-- | drivers/watchdog/sch311x_wdt.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c index 9681ada0f25..b96127ea3de 100644 --- a/drivers/watchdog/sch311x_wdt.c +++ b/drivers/watchdog/sch311x_wdt.c @@ -26,8 +26,7 @@ #include <linux/types.h> /* For standard types (like size_t) */ #include <linux/errno.h> /* For the -ENODEV/... values */ #include <linux/kernel.h> /* For printk/... */ -#include <linux/miscdevice.h> /* For MODULE_ALIAS_MISCDEV - (WATCHDOG_MINOR) */ +#include <linux/miscdevice.h> /* For struct miscdevice */ #include <linux/watchdog.h> /* For the watchdog specific items */ #include <linux/init.h> /* For __init/__exit/... */ #include <linux/fs.h> /* For file operations */ @@ -356,7 +355,7 @@ static struct miscdevice sch311x_wdt_miscdev = { * Init & exit routines */ -static int __devinit sch311x_wdt_probe(struct platform_device *pdev) +static int sch311x_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; int err; @@ -429,7 +428,7 @@ exit: return err; } -static int __devexit sch311x_wdt_remove(struct platform_device *pdev) +static int sch311x_wdt_remove(struct platform_device *pdev) { /* Stop the timer before we leave */ if (!nowayout) @@ -451,7 +450,7 @@ static void sch311x_wdt_shutdown(struct platform_device *dev) static struct platform_driver sch311x_wdt_driver = { .probe = sch311x_wdt_probe, - .remove = __devexit_p(sch311x_wdt_remove), + .remove = sch311x_wdt_remove, .shutdown = sch311x_wdt_shutdown, .driver = { .owner = THIS_MODULE, @@ -545,5 +544,3 @@ module_exit(sch311x_wdt_exit); MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>"); MODULE_DESCRIPTION("SMSC SCH311x WatchDog Timer Driver"); MODULE_LICENSE("GPL"); -MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); - |