Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp584834ybm; Wed, 27 May 2020 03:02:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlfUP5V/f//nDLroNQm4K/CdGfHRLkP93GPN/tT3YF9LrcArzoihB1YNoN8Qaaed1Kma9G X-Received: by 2002:a17:906:4e13:: with SMTP id z19mr4996109eju.339.1590573759527; Wed, 27 May 2020 03:02:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590573759; cv=none; d=google.com; s=arc-20160816; b=YNmWZG5LcV+tjDEzNbSLwGj0SsPRKFxjWc4J70b3e3GEmTLPitIc9qcGJsoqp11HI/ aE4d0NZCN/J5lw+VhAsWFFH2Gqmt/FJ1HZAcvNfx/rGWsoBIzaKkaVlHch6nAhe6ZNY5 cqNRW9k6xnHId6wemkUorzR7VSLzSKuLRJoxO8w1QDlAb+RxEcFxlYNX+fOdB1JQBeMS QRUWc0irq68UIulooLuih4nFOo97nxCCJsAVglFLDdTvH+ZdbrywD5dKktKQyrXcyWBx apbX9qlJL0p9v9zaCQKeQxeH0d/NGC2M4tpg+Wk2SNa5GTC2Gnp0nE2REwng5uZnIo5m 1TIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=wUc8Rld3qG+8FiFu0E8M2eleNECsorld6shnhtOeqbA=; b=QlmmcHGRQEcI8yYCp4F6sQjFORlwL2hBbsp/BHXDxZBRfRYaUFflpZXf7h6IjVJS7a 5lozWGz5jiCK3mEcQo+MVciVSlI33A08mqklEjocOdiCqYUDkUqTERt1AGXztfN3yCx5 IVeOmhV3EnE9SBGZ36+MKFv0L9UNd95dMACvs1z672WcOcEhPwVUv4WWdLl87M/mPJ4y hvi2TbR5PLN4/2VwC3v1Pov0f/tDGXDpwG4sQG45aREkjGFMVXEiE951mhwHDmcI50EK PkqJxEe+NwBme6oQJHysoY6OYmjvvl8TjIti9x/be0DkTrs9eQmQRk/Bnat1PG24n+3v FjCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n17si1570687ejd.437.2020.05.27.03.02.16; Wed, 27 May 2020 03:02:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727880AbgE0GRN (ORCPT + 99 others); Wed, 27 May 2020 02:17:13 -0400 Received: from [58.211.163.100] ([58.211.163.100]:59990 "EHLO mail.advantech.com.cn" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725267AbgE0GRM (ORCPT ); Wed, 27 May 2020 02:17:12 -0400 Received: from ACNMB2.ACN.ADVANTECH.CORP (unverified [172.21.128.148]) by ACN-SWEEPER01.ACN.ADVANTECH.CORP (Clearswift SMTPRS 5.6.0) with ESMTP id ; Wed, 27 May 2020 14:14:13 +0800 Received: from ADVANTECH.CORP (172.17.10.144) by ACNMB2.ACN.ADVANTECH.CORP (172.21.128.148) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 27 May 2020 14:17:06 +0800 From: To: <345351830@qq.com> CC: , , , Yuechao Zhao , Jean Delvare , Guenter Roeck , , Subject: [v3,1/1] hwmon:(nct7904) Set default timeout Date: Wed, 27 May 2020 06:16:59 +0000 Message-ID: <1590560219-41328-1-git-send-email-yuechao.zhao@advantech.com.cn> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.17.10.144] X-ClientProxiedBy: ACLDAG.ADVANTECH.CORP (172.20.2.88) To ACNMB2.ACN.ADVANTECH.CORP (172.21.128.148) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yuechao Zhao 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 paraameter specified". Signed-off-by: Yuechao Zhao --- Change in v3: - replace 'static int timeout = WATCHDOG_TIMEOUT;' with 'static int timeout;' - fixed typo Change in v2: - modify subject to 'hwmon:(nct7904) Set default timeout' --- drivers/hwmon/nct7904.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c index 18c95be..b042569 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; -- 1.8.3.1