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

Commit fa928ee8 authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

watchdog: booke_wdt: Use infrastructure to check timeout limits 



The watchdog infrastructure checks the maximum timeout for us.
Use it.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 64307b48

drivers/watchdog/booke_wdt.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -186,8 +186,6 @@ static int booke_wdt_stop(struct watchdog_device *wdog) 
static int booke_wdt_set_timeout(struct watchdog_device *wdt_dev,

static int booke_wdt_set_timeout(struct watchdog_device *wdt_dev,

				 unsigned int timeout)

				 unsigned int timeout)

{

{

	if (timeout > MAX_WDT_TIMEOUT)

		return -EINVAL;

	wdt_dev->timeout = timeout;

	wdt_dev->timeout = timeout;

	booke_wdt_set(wdt_dev);

	booke_wdt_set(wdt_dev);
@@ -211,7 +209,6 @@ static struct watchdog_device booke_wdt_dev = { 
	.info = &booke_wdt_info,

	.info = &booke_wdt_info,

	.ops = &booke_wdt_ops,

	.ops = &booke_wdt_ops,

	.min_timeout = 1,

	.min_timeout = 1,

	.max_timeout = 0xFFFF

};

};





static void __exit booke_wdt_exit(void)

static void __exit booke_wdt_exit(void)
@@ -229,6 +226,7 @@ static int __init booke_wdt_init(void) 
	booke_wdt_set_timeout(&booke_wdt_dev,

	booke_wdt_set_timeout(&booke_wdt_dev,

			      period_to_sec(booke_wdt_period));

			      period_to_sec(booke_wdt_period));

	watchdog_set_nowayout(&booke_wdt_dev, nowayout);

	watchdog_set_nowayout(&booke_wdt_dev, nowayout);

	booke_wdt_dev.max_timeout = MAX_WDT_TIMEOUT;

	if (booke_wdt_enabled)

	if (booke_wdt_enabled)

		booke_wdt_start(&booke_wdt_dev);

		booke_wdt_start(&booke_wdt_dev);