watchdog: ebc-c384_wdt: Utilize devm_ functions in driver probe callback

The devm_ resource manager functions allow memory to be automatically
released when a device is unbound. This patch takes advantage of the
resource manager functions and replaces the watchdog_register_device
call with the devm_watchdog_register_device call. In addition, the
ebc_c384_wdt_remove function has been removed as no longer necessary due
to the use of the relevant devm_ resource manager functions.

Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c
index 4b849b8e37c2621ab6be50b1b4a0b2f6c81f9297..2170b275ea017ab2c0fcf35294111b2cf58da8ca 100644 (file)
--- a/drivers/watchdog/ebc-c384_wdt.c
+++ b/drivers/watchdog/ebc-c384_wdt.c
@@ -121,18 +121,7 @@ static int ebc_c384_wdt_probe(struct device *dev, unsigned int id)
                dev_warn(dev, "Invalid timeout (%u seconds), using default (%u seconds)\n",
                        timeout, WATCHDOG_TIMEOUT);
 
-       dev_set_drvdata(dev, wdd);
-
-       return watchdog_register_device(wdd);
-}
-
-static int ebc_c384_wdt_remove(struct device *dev, unsigned int id)
-{
-       struct watchdog_device *wdd = dev_get_drvdata(dev);
-
-       watchdog_unregister_device(wdd);
-
-       return 0;
+       return devm_watchdog_register_device(dev, wdd);
 }
 
 static struct isa_driver ebc_c384_wdt_driver = {
@@ -140,7 +129,6 @@ static struct isa_driver ebc_c384_wdt_driver = {
        .driver = {
                .name = MODULE_NAME
        },
-       .remove = ebc_c384_wdt_remove
 };
 
 static int __init ebc_c384_wdt_init(void)