From: Felipe Balbi <[email protected]> it now comes from retu.c, so use that.
Signed-off-by: Felipe Balbi <[email protected]> --- drivers/cbus/retu-wdt.c | 34 +--------------------------------- 1 files changed, 1 insertions(+), 33 deletions(-) diff --git a/drivers/cbus/retu-wdt.c b/drivers/cbus/retu-wdt.c index 380fae6..763b34f 100644 --- a/drivers/cbus/retu-wdt.c +++ b/drivers/cbus/retu-wdt.c @@ -32,7 +32,6 @@ #include <linux/completion.h> #include <linux/errno.h> #include <linux/moduleparam.h> -#include <linux/platform_device.h> #include <linux/miscdevice.h> #include <linux/watchdog.h> @@ -48,7 +47,6 @@ #define RETU_WDT_DEFAULT_TIMER 32 #define RETU_WDT_MAX_TIMER 63 -static struct completion retu_wdt_completion; static DEFINE_MUTEX(retu_wdt_mutex); /* Current period of watchdog */ @@ -321,21 +319,8 @@ static int __devexit retu_wdt_remove(struct device *dev) return 0; } -static void retu_wdt_device_release(struct device *dev) -{ - complete(&retu_wdt_completion); -} - -static struct platform_device retu_wdt_device = { - .name = "retu-watchdog", - .id = -1, - .dev = { - .release = retu_wdt_device_release, - }, -}; - static struct device_driver retu_wdt_driver = { - .name = "retu-watchdog", + .name = "retu-wdt", .bus = &platform_bus_type, .probe = retu_wdt_probe, .remove = __devexit_p(retu_wdt_remove), @@ -349,16 +334,10 @@ static int __init retu_wdt_init(void) if (!ret) return -ENODEV; - init_completion(&retu_wdt_completion); - ret = driver_register(&retu_wdt_driver); if (ret) return ret; - ret = platform_device_register(&retu_wdt_device); - if (ret) - goto exit1; - /* passed as module parameter? */ ret = retu_modify_counter(counter_param); if (ret == -EINVAL) { @@ -367,23 +346,12 @@ static int __init retu_wdt_init(void) "retu_wdt_init: Intializing to default value\n"); } - printk(KERN_INFO "Retu watchdog driver initialized\n"); - return retu_wdt_ping(); - -exit1: - driver_unregister(&retu_wdt_driver); - wait_for_completion(&retu_wdt_completion); - - return ret; } static void __exit retu_wdt_exit(void) { - platform_device_unregister(&retu_wdt_device); driver_unregister(&retu_wdt_driver); - - wait_for_completion(&retu_wdt_completion); } module_init(retu_wdt_init); -- 1.7.0.rc0.33.g7c3932 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
