summaryrefslogtreecommitdiff
path: root/drivers/hwmon/nct7904.c
diff options
context:
space:
mode:
authorYuechao Zhao <yuechao.zhao@advantech.com.cn>2020-05-27 09:16:59 +0300
committerGuenter Roeck <linux@roeck-us.net>2020-05-27 09:46:24 +0300
commit156ad7f9e0b39cfa0ed02e42c6e1c258c4e81e05 (patch)
treec9907cb0102d25f8681f39b8c4495e2bf5c71513 /drivers/hwmon/nct7904.c
parent59dd36f41ea6a5c69c1f737125251df2ff8eb5ce (diff)
downloadlinux-156ad7f9e0b39cfa0ed02e42c6e1c258c4e81e05.tar.xz
hwmon: (nct7904) Set default timeout
The timeout module parameter should not be used for setting the default timeout. Because, if you set the timeout = 0, the default timeout will be meaningless. And the timeout module parameter of 0 means "no timeout module parameter specified". Signed-off-by: Yuechao Zhao <yuechao.zhao@advantech.com.cn> Link: https://lore.kernel.org/r/1590560219-41328-1-git-send-email-yuechao.zhao@advantech.com.cn Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/nct7904.c')
-rw-r--r--drivers/hwmon/nct7904.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
index 18c95be4f5d4..b0425694f702 100644
--- a/drivers/hwmon/nct7904.c
+++ b/drivers/hwmon/nct7904.c
@@ -111,14 +111,14 @@
#define MIN_TIMEOUT (1 * 60)
#define MAX_TIMEOUT (255 * 60)
-static int timeout = WATCHDOG_TIMEOUT;
+static int timeout;
module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in minutes. 1 <= timeout <= 255, default="
- __MODULE_STRING(WATCHODOG_TIMEOUT) ".");
+ __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
static bool nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, bool, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started once started (default="
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
static const unsigned short normal_i2c[] = {
@@ -1147,7 +1147,7 @@ static int nct7904_probe(struct i2c_client *client,
data->wdt.ops = &nct7904_wdt_ops;
data->wdt.info = &nct7904_wdt_info;
- data->wdt.timeout = timeout * 60; /* in seconds */
+ data->wdt.timeout = WATCHDOG_TIMEOUT * 60; /* Set default timeout */
data->wdt.min_timeout = MIN_TIMEOUT;
data->wdt.max_timeout = MAX_TIMEOUT;
data->wdt.parent = &client->dev;