Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

watchdog: retu_wdt: Clean-up by using managed work init

Few drivers implement remove call-back only for ensuring a delayed
work gets cancelled prior driver removal. Clean-up these by switching
to use devm_delayed_work_autocancel() instead.

This change is compile-tested only. All testing is appreciated.

Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Link: https://lore.kernel.org/r/be299515fbee2c311162ca99ea0dbee933044b56.1616506559.git.matti.vaittinen@fi.rohmeurope.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Matti Vaittinen and committed by
Greg Kroah-Hartman
a7d30f3f b6688015

+6 -16
+6 -16
drivers/watchdog/retu_wdt.c
··· 8 8 * Rewritten by Aaro Koskinen. 9 9 */ 10 10 11 + #include <linux/devm-helpers.h> 11 12 #include <linux/slab.h> 12 13 #include <linux/errno.h> 13 14 #include <linux/device.h> ··· 128 127 wdev->rdev = rdev; 129 128 wdev->dev = &pdev->dev; 130 129 131 - INIT_DELAYED_WORK(&wdev->ping_work, retu_wdt_ping_work); 130 + ret = devm_delayed_work_autocancel(&pdev->dev, &wdev->ping_work, 131 + retu_wdt_ping_work); 132 + if (ret) 133 + return ret; 132 134 133 - ret = watchdog_register_device(retu_wdt); 135 + ret = devm_watchdog_register_device(&pdev->dev, retu_wdt); 134 136 if (ret < 0) 135 137 return ret; 136 138 ··· 142 138 else 143 139 retu_wdt_ping_enable(wdev); 144 140 145 - platform_set_drvdata(pdev, retu_wdt); 146 - 147 - return 0; 148 - } 149 - 150 - static int retu_wdt_remove(struct platform_device *pdev) 151 - { 152 - struct watchdog_device *wdog = platform_get_drvdata(pdev); 153 - struct retu_wdt_dev *wdev = watchdog_get_drvdata(wdog); 154 - 155 - watchdog_unregister_device(wdog); 156 - cancel_delayed_work_sync(&wdev->ping_work); 157 - 158 141 return 0; 159 142 } 160 143 161 144 static struct platform_driver retu_wdt_driver = { 162 145 .probe = retu_wdt_probe, 163 - .remove = retu_wdt_remove, 164 146 .driver = { 165 147 .name = "retu-wdt", 166 148 },