From patchwork Tue Aug 6 02:30:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amy.Shih@advantech.com.tw X-Patchwork-Id: 11078149 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C6649112C for ; Tue, 6 Aug 2019 02:40:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B514222B26 for ; Tue, 6 Aug 2019 02:40:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8F912896D; Tue, 6 Aug 2019 02:40:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A71C22B26 for ; Tue, 6 Aug 2019 02:40:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731306AbfHFCkY (ORCPT ); Mon, 5 Aug 2019 22:40:24 -0400 Received: from aclms3.advantech.com.tw ([125.252.70.86]:62562 "EHLO ACLMS3.advantech.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729334AbfHFCkY (ORCPT ); Mon, 5 Aug 2019 22:40:24 -0400 X-Greylist: delayed 602 seconds by postgrey-1.27 at vger.kernel.org; Mon, 05 Aug 2019 22:40:23 EDT Received: from taipei08.ADVANTECH.CORP (unverified [172.20.0.235]) by ACLMS3.advantech.com.tw (Clearswift SMTPRS 5.6.0) with ESMTP id ; Tue, 6 Aug 2019 10:30:19 +0800 From: To: CC: , , , Jean Delvare , Guenter Roeck , , Subject: [v4 1/2] hwmon: (nct7904) Fix the incorrect return value of case hwmon_fan_min in function "nct7904_write_fan". Date: Tue, 6 Aug 2019 02:30:07 +0000 Message-ID: X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [172.17.10.28] X-ClientProxiedBy: ACLDAG.ADVANTECH.CORP (172.20.2.88) To taipei08.ADVANTECH.CORP (172.20.0.235) X-StopIT: No Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "amy.shih" Return the -EINVAL(Invalid argument) when writing the values <= 0 to sysfs node fan[1-*]_min. Signed-off-by: amy.shih Changes in v4: - Fix the incorrect return value of case hwmon_fan_min in function "nct7904_write_fan". Changes in v3: - Squashed subsequent fixes of below patches into one patch. -- Fix bad fallthrough in various switch statements. -- Fix the wrong declared of tmp as u8 in nct7904_write_in, declared tmp to int. -- Fix incorrect register setting of voltage. -- Fix incorrect register bit mapping of temperature alarm. -- Fix wrong return code 0x1fff in function nct7904_write_fan. -- Delete wrong comment in function nct7904_write_in. -- Fix wrong attribute names for temperature. -- Fix wrong registers setting for temperature. Changes in v2: - Fix bad fallthrough in various switch statements. - Fix the wrong declared of tmp as u8 in nct7904_write_in, declared tmp to int. --- drivers/hwmon/nct7904.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c index d842c10ba11f..6527b56e4f6c 100644 --- a/drivers/hwmon/nct7904.c +++ b/drivers/hwmon/nct7904.c @@ -551,7 +551,7 @@ static int nct7904_write_fan(struct device *dev, u32 attr, int channel, switch (attr) { case hwmon_fan_min: if (val <= 0) - return 0; + return -EINVAL; val = clamp_val((1350000 + (val >> 1)) / val, 1, 0x1fff); tmp = (val >> 5) & 0xff; From patchwork Tue Aug 6 02:31:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amy.Shih@advantech.com.tw X-Patchwork-Id: 11078151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E96DC13A4 for ; Tue, 6 Aug 2019 02:40:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6A6A22B26 for ; Tue, 6 Aug 2019 02:40:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA7E22896D; Tue, 6 Aug 2019 02:40:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C31128831 for ; Tue, 6 Aug 2019 02:40:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729334AbfHFCkZ (ORCPT ); Mon, 5 Aug 2019 22:40:25 -0400 Received: from aclms3.advantech.com.tw ([125.252.70.86]:62562 "EHLO ACLMS3.advantech.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731387AbfHFCkZ (ORCPT ); Mon, 5 Aug 2019 22:40:25 -0400 X-Greylist: delayed 602 seconds by postgrey-1.27 at vger.kernel.org; Mon, 05 Aug 2019 22:40:23 EDT Received: from taipei08.ADVANTECH.CORP (unverified [172.20.0.235]) by ACLMS3.advantech.com.tw (Clearswift SMTPRS 5.6.0) with ESMTP id ; Tue, 6 Aug 2019 10:31:59 +0800 From: To: CC: , , , Jean Delvare , Guenter Roeck , , Subject: [v4 2/2] hwmon: (nct7904) Fix the confused calculation of case hwmon_fan_min in function "nct7904_write_fan". Date: Tue, 6 Aug 2019 02:31:46 +0000 Message-ID: <83bd9eed7e19ffc8c064648ae00bf1c71b9d2815.1565006479.git.amy.shih@advantech.com.tw> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.17.10.28] X-ClientProxiedBy: ACLDAG.ADVANTECH.CORP (172.20.2.88) To taipei08.ADVANTECH.CORP (172.20.0.235) X-StopIT: No Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "amy.shih" Use the macro "DIV_ROUND_CLOSEST" instead. Signed-off-by: amy.shih Changes in v4: - Fix the confused calculation of case hwmon_fan_min in function "nct7904_write_fan". Changes in v3: - Squashed subsequent fixes of below patches into one patch. -- Fix bad fallthrough in various switch statements. -- Fix the wrong declared of tmp as u8 in nct7904_write_in, declared tmp to int. -- Fix incorrect register setting of voltage. -- Fix incorrect register bit mapping of temperature alarm. -- Fix wrong return code 0x1fff in function nct7904_write_fan. -- Delete wrong comment in function nct7904_write_in. -- Fix wrong attribute names for temperature. -- Fix wrong registers setting for temperature. Changes in v2: - Fix bad fallthrough in various switch statements. - Fix the wrong declared of tmp as u8 in nct7904_write_in, declared tmp to int. --- drivers/hwmon/nct7904.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c index 6527b56e4f6c..76372f20d71a 100644 --- a/drivers/hwmon/nct7904.c +++ b/drivers/hwmon/nct7904.c @@ -553,7 +553,7 @@ static int nct7904_write_fan(struct device *dev, u32 attr, int channel, if (val <= 0) return -EINVAL; - val = clamp_val((1350000 + (val >> 1)) / val, 1, 0x1fff); + val = clamp_val(DIV_ROUND_CLOSEST(1350000, val), 1, 0x1fff); tmp = (val >> 5) & 0xff; ret = nct7904_write_reg(data, BANK_1, FANIN1_HV_HL_REG + channel * 2, tmp);