From patchwork Wed Feb 21 21:09:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10234043 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F2E3602A7 for ; Wed, 21 Feb 2018 21:10:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EEB428517 for ; Wed, 21 Feb 2018 21:10:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 726D128524; Wed, 21 Feb 2018 21:10:21 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 0C21A28517 for ; Wed, 21 Feb 2018 21:10:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751270AbeBUVKU (ORCPT ); Wed, 21 Feb 2018 16:10:20 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:36675 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751610AbeBUVJr (ORCPT ); Wed, 21 Feb 2018 16:09:47 -0500 Received: by mail-pg0-f67.google.com with SMTP id j9so1144981pgv.3 for ; Wed, 21 Feb 2018 13:09:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uC5xVyvxl0rE0s0FQ+MPeG5ULbb0mOeNhBdxOC4rq50=; b=bSiQl5TxVYtyL7uQVv0gHLTSef46ppV44xGLq82CTBjjJWlpy8PwkTV1SRKraDB3q2 vWOzF1me8dBJImeb01CChIfxBIAnrE3P/9sEFABAZobsK7WK5lhNGcW0Q/AI+uB/Cnxi DTYlCsSYVYtgIV5f/U/iX69Sa1P8A8TH1y6XDQgT9eQoyNREm/hI5i5hPz2IN3c1rif3 28yhS36UDxjinl3/UW60Ira4eeDaVlEwuCd4NcFUaeNR0OKjRZzVvmJ75WTWyO5fmvdC /OVnLi4OGG4EBSSHi0sy69txMVLwHrdvOXcwJS4ZVjFVTyBSFmtUc5/b7FJIz6pMepfg JSzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=uC5xVyvxl0rE0s0FQ+MPeG5ULbb0mOeNhBdxOC4rq50=; b=g/MY0M1wF80MKJUv2oIJDsvMUJUpkYxy/IJUXIYPctpl9Xr2fhLIcIPdlxlBIL6Ncf BoUk74NxThy2khaLMDRaCPqi3kJinD2Pz3BTKAz0gId/E/IX8x13oHDHEcjeqG7VEmWx o19Mr/SO1CElOJbLjY1jPcwypn1Ay8jQgTyMX9EPRDhP/dsDHp1NI3ANkEfvRFZYp06u qgBFlBixfLoKLx8gMSx96F0rKKmKuLj65DFIt7V7kzArwnPTXvduCjqO61QvBfJhFVc8 GujE7uEXGsrHlaq6nt84tAR7izViSlTO+g0uQTRNY7H63Fbyzp2jNjZ9jdDyZlecokJw aXkQ== X-Gm-Message-State: APf1xPBrReB30FoB8R44NSLWhk+iw27rJ4n+RsGQisTeXF3bRJ4QBXN3 vPHehX+yypBdC6fkYmYGlla2xQ== X-Google-Smtp-Source: AH8x2250uelW2PDJp03UekJyZeDvYbH9MJpTqwT3z3NJKUFpb1cZFEfCZZ5H7sIZ/CB0Y8tHSFwvAA== X-Received: by 10.99.147.14 with SMTP id b14mr3857436pge.14.1519247386430; Wed, 21 Feb 2018 13:09:46 -0800 (PST) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id u3sm50561389pgo.62.2018.02.21.13.09.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Feb 2018 13:09:45 -0800 (PST) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 3/4] hwmon: (nct6775) Initialize boolean variables with declaration Date: Wed, 21 Feb 2018 13:09:38 -0800 Message-Id: <1519247379-29443-3-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519247379-29443-1-git-send-email-linux@roeck-us.net> References: <1519247379-29443-1-git-send-email-linux@roeck-us.net> 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 Initialize boolean flags in nct6775_check_fan_inputs() while declaring them instead of several times throughout the code. Signed-off-by: Guenter Roeck --- drivers/hwmon/nct6775.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index cebd716ddc91..5662b23dbffa 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -3360,8 +3360,10 @@ static inline void nct6775_init_device(struct nct6775_data *data) static void nct6775_check_fan_inputs(struct nct6775_data *data) { - bool fan3pin, fan4pin, fan4min, fan5pin, fan6pin; - bool pwm3pin, pwm4pin, pwm5pin, pwm6pin; + bool fan3pin = false, fan4pin = false, fan4min = false; + bool fan5pin = false, fan6pin = false; + bool pwm3pin = false, pwm4pin = false, pwm5pin = false; + bool pwm6pin = false; int sioreg = data->sioreg; int regval; @@ -3378,12 +3380,6 @@ nct6775_check_fan_inputs(struct nct6775_data *data) /* On NCT6775, fan4 shares pins with the fdc interface */ fan4pin = !(superio_inb(sioreg, 0x2A) & 0x80); - fan4min = false; - fan5pin = false; - fan6pin = false; - pwm4pin = false; - pwm5pin = false; - pwm6pin = false; } else if (data->kind == nct6776) { bool gpok = superio_inb(sioreg, 0x27) & 0x80; const char *board_vendor, *board_name; @@ -3423,23 +3419,11 @@ nct6775_check_fan_inputs(struct nct6775_data *data) fan5pin = superio_inb(sioreg, 0x1C) & 0x02; fan4min = fan4pin; - fan6pin = false; pwm3pin = fan3pin; - pwm4pin = false; - pwm5pin = false; - pwm6pin = false; } else if (data->kind == nct6106) { regval = superio_inb(sioreg, 0x24); fan3pin = !(regval & 0x80); pwm3pin = regval & 0x08; - - fan4pin = false; - fan4min = false; - fan5pin = false; - fan6pin = false; - pwm4pin = false; - pwm5pin = false; - pwm6pin = false; } else { /* NCT6779D, NCT6791D, NCT6792D, NCT6793D, or NCT6795D */ int regval_1b, regval_2a, regval_2f, regval_eb; bool dsw_en; @@ -3474,8 +3458,6 @@ nct6775_check_fan_inputs(struct nct6775_data *data) if (!fan5pin) fan5pin = regval_1b & BIT(5); - fan6pin = false; - pwm6pin = false; if (!dsw_en) { fan6pin = regval & BIT(1); pwm6pin = regval & BIT(0); @@ -3506,8 +3488,6 @@ nct6775_check_fan_inputs(struct nct6775_data *data) } break; default: /* NCT6779D */ - fan6pin = false; - pwm6pin = false; break; }