Skip to content

Commit 6d72c7a

Browse files
liuxp11Wim Van Sebroeck
authored andcommitted
watchdog: wdat_wdt: Using the existing function to check parameter timeout
If max_hw_heartbeat_ms is provided, the configured maximum timeout is not limited by it. The limit check in this driver therefore doesn't make much sense. Similar, the watchdog core ensures that minimum timeout limits are met if min_hw_heartbeat_ms is set. Using watchdog_timeout_invalid() makes more sense because it takes this into account. Signed-off-by: Liu Xinpeng <liuxp11@chinatelecom.cn> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/1650984810-6247-2-git-send-email-liuxp11@chinatelecom.cn Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
1 parent 382256b commit 6d72c7a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/watchdog/wdat_wdt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)
344344
wdat->period = tbl->timer_period;
345345
wdat->wdd.min_hw_heartbeat_ms = wdat->period * tbl->min_count;
346346
wdat->wdd.max_hw_heartbeat_ms = wdat->period * tbl->max_count;
347+
wdat->wdd.min_timeout = 1;
347348
wdat->stopped_in_sleep = tbl->flags & ACPI_WDAT_STOPPED;
348349
wdat->wdd.info = &wdat_wdt_info;
349350
wdat->wdd.ops = &wdat_wdt_ops;
@@ -450,8 +451,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)
450451
* watchdog properly after it has opened the device. In some cases
451452
* the BIOS default is too short and causes immediate reboot.
452453
*/
453-
if (timeout * 1000 < wdat->wdd.min_hw_heartbeat_ms ||
454-
timeout * 1000 > wdat->wdd.max_hw_heartbeat_ms) {
454+
if (watchdog_timeout_invalid(&wdat->wdd, timeout)) {
455455
dev_warn(dev, "Invalid timeout %d given, using %d\n",
456456
timeout, WDAT_DEFAULT_TIMEOUT);
457457
timeout = WDAT_DEFAULT_TIMEOUT;

0 commit comments

Comments
 (0)