diff options
Diffstat (limited to 'drivers/watchdog/ie6xx_wdt.c')
| -rw-r--r-- | drivers/watchdog/ie6xx_wdt.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c index 5f0d776f902..07f88f54e5c 100644 --- a/drivers/watchdog/ie6xx_wdt.c +++ b/drivers/watchdog/ie6xx_wdt.c @@ -28,7 +28,6 @@ #include <linux/kernel.h> #include <linux/types.h> #include <linux/watchdog.h> -#include <linux/miscdevice.h> #include <linux/seq_file.h> #include <linux/debugfs.h> #include <linux/uaccess.h> @@ -225,29 +224,29 @@ static const struct file_operations ie6xx_wdt_dbg_operations = { .release = single_release, }; -static void __devinit ie6xx_wdt_debugfs_init(void) +static void ie6xx_wdt_debugfs_init(void) { /* /sys/kernel/debug/ie6xx_wdt */ ie6xx_wdt_data.debugfs = debugfs_create_file("ie6xx_wdt", S_IFREG | S_IRUGO, NULL, NULL, &ie6xx_wdt_dbg_operations); } -static void __devexit ie6xx_wdt_debugfs_exit(void) +static void ie6xx_wdt_debugfs_exit(void) { debugfs_remove(ie6xx_wdt_data.debugfs); } #else -static void __devinit ie6xx_wdt_debugfs_init(void) +static void ie6xx_wdt_debugfs_init(void) { } -static void __devexit ie6xx_wdt_debugfs_exit(void) +static void ie6xx_wdt_debugfs_exit(void) { } #endif -static int __devinit ie6xx_wdt_probe(struct platform_device *pdev) +static int ie6xx_wdt_probe(struct platform_device *pdev) { struct resource *res; u8 wdtlr; @@ -295,7 +294,7 @@ misc_register_error: return ret; } -static int __devexit ie6xx_wdt_remove(struct platform_device *pdev) +static int ie6xx_wdt_remove(struct platform_device *pdev) { struct resource *res; @@ -311,7 +310,7 @@ static int __devexit ie6xx_wdt_remove(struct platform_device *pdev) static struct platform_driver ie6xx_wdt_driver = { .probe = ie6xx_wdt_probe, - .remove = __devexit_p(ie6xx_wdt_remove), + .remove = ie6xx_wdt_remove, .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, @@ -344,5 +343,4 @@ module_exit(ie6xx_wdt_exit); MODULE_AUTHOR("Alexander Stein <alexander.stein@systec-electronic.com>"); MODULE_DESCRIPTION("Intel Atom E6xx Watchdog Device Driver"); MODULE_LICENSE("GPL"); -MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); MODULE_ALIAS("platform:" DRIVER_NAME); |