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

Commit e8cf96ab authored by Wolfram Sang's avatar Wolfram Sang Committed by Wim Van Sebroeck
Browse files

watchdog: softdog: use watchdog core to init timeout value 



Error string and comment say we fall back to a default, but in reality
we bailed out. Refactor the code to use the core helper which then
matches the described behaviour. While updating the init message anyhow,
shorten it while we are here; no need for versioning there as well and
the name is already given via pr_fmt.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
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 9c963ba0

drivers/watchdog/softdog.c

+5 −12
Original line number Diff line number Diff line
@@ -111,22 +111,15 @@ static struct watchdog_device softdog_dev = { 
	.info = &softdog_info,

	.ops = &softdog_ops,

	.min_timeout = 1,

	.max_timeout = 0xFFFF

	.max_timeout = 65535,

	.timeout = TIMER_MARGIN,

};



static int __init watchdog_init(void)

{

	int ret;



	/* Check that the soft_margin value is within it's range;

	   if not reset to the default */

	if (soft_margin < 1 || soft_margin > 65535) {

		pr_info("soft_margin must be 0 < soft_margin < 65536, using %d\n",

			TIMER_MARGIN);

		return -EINVAL;

	}

	softdog_dev.timeout = soft_margin;



	watchdog_init_timeout(&softdog_dev, soft_margin, NULL);

	watchdog_set_nowayout(&softdog_dev, nowayout);

	watchdog_stop_on_reboot(&softdog_dev);
@@ -134,8 +127,8 @@ static int __init watchdog_init(void) 
	if (ret)

		return ret;



	pr_info("Software Watchdog Timer: 0.08 initialized. soft_noboot=%d soft_margin=%d sec soft_panic=%d (nowayout=%d)\n",

		soft_noboot, soft_margin, soft_panic, nowayout);

	pr_info("initialized. soft_noboot=%d soft_margin=%d sec soft_panic=%d (nowayout=%d)\n",

		soft_noboot, softdog_dev.timeout, soft_panic, nowayout);



	return 0;

}