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

Commit 1cc7495c authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Wim Van Sebroeck
Browse files

watchdog: bcm47xx_wdt.c: add restart handler support 



Just like in case of other watchdog drivers, use the new kernel core
API to provide restart support.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent ba804a95

drivers/watchdog/bcm47xx_wdt.c

+20 −1
Original line number Diff line number Diff line
@@ -169,6 +169,17 @@ static int bcm47xx_wdt_notify_sys(struct notifier_block *this, 
	return NOTIFY_DONE;

}



static int bcm47xx_wdt_restart(struct notifier_block *this, unsigned long mode,

			       void *cmd)

{

	struct bcm47xx_wdt *wdt;



	wdt = container_of(this, struct bcm47xx_wdt, restart_handler);

	wdt->timer_set(wdt, 1);



	return NOTIFY_DONE;

}



static struct watchdog_ops bcm47xx_wdt_soft_ops = {

	.owner		= THIS_MODULE,

	.start		= bcm47xx_wdt_soft_start,
@@ -209,15 +220,23 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev) 
	if (ret)

		goto err_timer;



	ret = watchdog_register_device(&wdt->wdd);

	wdt->restart_handler.notifier_call = &bcm47xx_wdt_restart;

	wdt->restart_handler.priority = 64;

	ret = register_restart_handler(&wdt->restart_handler);

	if (ret)

		goto err_notifier;



	ret = watchdog_register_device(&wdt->wdd);

	if (ret)

		goto err_handler;



	dev_info(&pdev->dev, "BCM47xx Watchdog Timer enabled (%d seconds%s%s)\n",

		timeout, nowayout ? ", nowayout" : "",

		soft ? ", Software Timer" : "");

	return 0;



err_handler:

	unregister_restart_handler(&wdt->restart_handler);

err_notifier:

	unregister_reboot_notifier(&wdt->notifier);

err_timer:

include/linux/bcm47xx_wdt.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ struct bcm47xx_wdt { 


	struct watchdog_device wdd;

	struct notifier_block notifier;

	struct notifier_block restart_handler;



	struct timer_list soft_timer;

	atomic_t soft_ticks;