Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d2e5eb5 authored by André Draszik's avatar André Draszik Committed by Wim Van Sebroeck
Browse files

watchdog: mt7621: switch to using managed devm_watchdog_register_device() 



This does the necessary cleanup on driver unload automatically.

Signed-off-by: default avatarAndré Draszik <git@andred.net>
Cc: linux-watchdog@vger.kernel.org
Cc: John Crispin <john@phrozen.org>
Reviewed-by: default avatarGuenter Roeck <Linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 392d39a8

drivers/watchdog/mt7621_wdt.c

+1 −12
Original line number Diff line number Diff line
@@ -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);
@@ -164,16 +163,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)
@@ -189,7 +179,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,