On Wed, Jan 10, 2018 at 12:13:23PM +0000, André Draszik wrote:
> This does the necessary cleanup on driver unload automatically.
>
> Signed-off-by: André Draszik <g...@andred.net>
> Cc: Wim Van Sebroeck <w...@iguana.be>
> Cc: Guenter Roeck <li...@roeck-us.net>
> Cc: linux-watch...@vger.kernel.org
> Cc: John Crispin <j...@phrozen.org>
Reviewed-by: Guenter Roeck <li...@roeck-us.net>
> ---
> drivers/watchdog/mt7621_wdt.c | 13 +------------
> 1 file changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
> index 0eabea2d88a2..a04f49309188 100644
> --- a/drivers/watchdog/mt7621_wdt.c
> +++ b/drivers/watchdog/mt7621_wdt.c
> @@ -133,7 +133,6 @@ static struct watchdog_device mt7621_wdt_dev = {
> static int mt7621_wdt_probe(struct platform_device *pdev)
> {
> struct resource *res;
> - int ret;
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> mt7621_wdt_base = devm_ioremap_resource(&pdev->dev, res);
> @@ -161,16 +160,7 @@ static int mt7621_wdt_probe(struct platform_device *pdev)
> set_bit(WDOG_HW_RUNNING, &mt7621_wdt_dev.status);
> }
>
> - ret = watchdog_register_device(&mt7621_wdt_dev);
> -
> - return 0;
> -}
> -
> -static int mt7621_wdt_remove(struct platform_device *pdev)
> -{
> - watchdog_unregister_device(&mt7621_wdt_dev);
> -
> - return 0;
> + return devm_watchdog_register_device(&pdev->dev, &mt7621_wdt_dev);
> }
>
> static void mt7621_wdt_shutdown(struct platform_device *pdev)
> @@ -186,7 +176,6 @@ MODULE_DEVICE_TABLE(of, mt7621_wdt_match);
>
> static struct platform_driver mt7621_wdt_driver = {
> .probe = mt7621_wdt_probe,
> - .remove = mt7621_wdt_remove,
> .shutdown = mt7621_wdt_shutdown,
> .driver = {
> .name = KBUILD_MODNAME,
> --
> 2.15.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
