Thread (11 messages) 11 messages, 2 authors, 2021-08-28
STALE1763d LANDED
Revisions (5)
  1. v2 [diff vs current]
  2. v3 [diff vs current]
  3. v3 [diff vs current]
  4. v4 [diff vs current]
  5. v5 current

[PATCH v5 2/7] watchdog: f71808e_wdt: remove superfluous global

From: Ahmad Fatoum <a.fatoum@pengutronix.de>
Date: 2021-08-09 16:21:47
Also in: lkml
Subsystem: the rest, watchdog device drivers · Maintainers: Linus Torvalds, Wim Van Sebroeck, Guenter Roeck

max_timeout never served any purpose over WATCHDOG_MAX_TIMEOUT, which it
was initialized with. Drop it.

Suggested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/watchdog/f71808e_wdt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c
index f7d82d261913..3a0b29cb5854 100644
--- a/drivers/watchdog/f71808e_wdt.c
+++ b/drivers/watchdog/f71808e_wdt.c
@@ -81,7 +81,6 @@ static unsigned short force_id;
 module_param(force_id, ushort, 0);
 MODULE_PARM_DESC(force_id, "Override the detected device ID");
 
-static const int max_timeout = WATCHDOG_MAX_TIMEOUT;
 static int timeout = WATCHDOG_TIMEOUT;	/* default timeout in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
@@ -221,7 +220,7 @@ static inline void superio_exit(int base)
 static int watchdog_set_timeout(int timeout)
 {
 	if (timeout <= 0
-	 || timeout >  max_timeout) {
+	 || timeout >  WATCHDOG_MAX_TIMEOUT) {
 		pr_err("watchdog timeout out of range\n");
 		return -EINVAL;
 	}
@@ -720,7 +719,7 @@ static int __init watchdog_init(int sioaddr)
 
 	if (start_withtimeout) {
 		if (start_withtimeout <= 0
-		 || start_withtimeout >  max_timeout) {
+		 || start_withtimeout >  WATCHDOG_MAX_TIMEOUT) {
 			pr_err("starting timeout out of range\n");
 			err = -EINVAL;
 			goto exit_miscdev;
-- 
git-series 0.9.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help