diff options
| author | William Breathitt Gray <vilhelm.gray@gmail.com> | 2017-01-24 17:02:33 -0500 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2017-02-24 14:00:23 -0800 |
| commit | 540aea3dbffc6a75d0b3b77db1cde36a065a6ab5 (patch) | |
| tree | d823ea7d647850588347553009b72e684cd92312 /drivers/watchdog | |
| parent | 4b448c96a7f0fd092a4113cab9248ddb7bf21c17 (diff) | |
| download | linux-540aea3dbffc6a75d0b3b77db1cde36a065a6ab5.tar.gz linux-540aea3dbffc6a75d0b3b77db1cde36a065a6ab5.tar.bz2 linux-540aea3dbffc6a75d0b3b77db1cde36a065a6ab5.zip | |
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>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/ebc-c384_wdt.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c index 4b849b8e37c2..2170b275ea01 100644 --- 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) |