From patchwork Thu Sep 20 13:45:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10607783 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 A5DA5157B for ; Thu, 20 Sep 2018 13:45:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 984932D74D for ; Thu, 20 Sep 2018 13:45:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BC162D750; Thu, 20 Sep 2018 13:45:53 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_SBL 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 3696C2D741 for ; Thu, 20 Sep 2018 13:45:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731025AbeITT30 (ORCPT ); Thu, 20 Sep 2018 15:29:26 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:45076 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727242AbeITT30 (ORCPT ); Thu, 20 Sep 2018 15:29:26 -0400 Received: by mail-pf1-f196.google.com with SMTP id i26-v6so4393398pfo.12 for ; Thu, 20 Sep 2018 06:45:52 -0700 (PDT) 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=wF8iGMgL9HBZTYYPDNDFemkKFe8K9YOqf4lPbqO2En4=; b=GosxkrIS8rfm//RALd+UkQ7Fm0kqBwL6eXEMzm8rv7X74VpZUY7RxrMWdXVS3Md7pJ Dc1Vm7/xaEnl13ecQwK7/wReKxb3CW/MsedtjLVwouVxVqcET7CuWEMb9DHIrjpd0NIH svOyZeA45nyuFiTp9PsxtSAPhInJqvmgZe+LCKl+MIMMEqJNqhshzNO3c1tpNBFjo62C b4W3r3dBIUhZKx3vcOosm2ia4mfvJSijLWYO8q0D3bFq0OnWj2ApQ93P9prYh5GXxvb/ M9ZgO1glfVqT7FdlQbl0lVzSFHkV/3HmqbGFaQn04v3sTeOz2NthPnnzsvycS1dfVahr 42pA== 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=wF8iGMgL9HBZTYYPDNDFemkKFe8K9YOqf4lPbqO2En4=; b=CZek3IT3pJQESjDoGrkMW8u3LY0oSQGvipQxDQqD6zwNVkA4Ogf49dgXIu7Mq1Dswu 6fBxOyZjRNd2wtqbqEc9jcAT0tq0Mua24XvKsxhfXB4yXKsy5tYczwGhW34e6pp8dWtH gaeH3QhZgMbUw0av6PiE6NLForKrI5QAyChDDLKr+MDyivOw1z9B/TIfUCVl+dQNpUjI 6mnHXceUbekrtE14/Xw8tg85wr25TH0iRW9CX9LPim/ETvxn5h8da3Aj6mRy9ZVHbaur StmzpW8wA+1smQ79O91Ngpl7zZgzMh5CdbvIghfiBn3u31mRigzOaecDXlu+VmGrxDTU +y2Q== X-Gm-Message-State: APzg51BHrvRFdnPHG2MF9gcbbY+rwkwHm2R1l+Y+IB1R7HpxUtO84j1d +c/UfRpp8uFuuRd2mHi38pwU0yOr X-Google-Smtp-Source: ANB0VdY96gWjdHrOoTKFuy116cnijBmejwCgIC3pNGuWeFMtyOJPUCffwGK/VAjv/8SCFj0oGV80pg== X-Received: by 2002:a62:3184:: with SMTP id x126-v6mr41138690pfx.49.1537451151765; Thu, 20 Sep 2018 06:45:51 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id g20-v6sm32138341pfo.94.2018.09.20.06.45.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Sep 2018 06:45:51 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 05/13] hwmon: (nct6775) Use logical or instead of if statements where possible Date: Thu, 20 Sep 2018 06:45:33 -0700 Message-Id: <1537451141-27242-5-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537451141-27242-1-git-send-email-linux@roeck-us.net> References: <1537451141-27242-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 Use boolean |= ; instead of if (!boolean) boolean = ; to assign values to boolean variables. No functional change. Signed-off-by: Guenter Roeck --- drivers/hwmon/nct6775.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 984b22d4999a..0f20f7c2a96b 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -3529,36 +3529,24 @@ nct6775_check_fan_inputs(struct nct6775_data *data) case nct6793: case nct6795: case nct6796: - if (!pwm5pin) - pwm5pin = cr2d & BIT(7); + pwm5pin |= cr2d & BIT(7); - if (!fan5pin) - fan5pin = cr1b & BIT(5); + fan5pin |= cr1b & BIT(5); if (data->kind != nct6796) { - if (!dsw_en) { - fan6pin = cr2d & BIT(1); - pwm6pin = cr2d & BIT(0); - } + fan6pin = !dsw_en && (cr2d & BIT(1)); + pwm6pin = !dsw_en && (cr2d & BIT(0)); - if (!fan5pin) - fan5pin = creb & BIT(5); - if (!pwm5pin) - pwm5pin = (creb & BIT(4)) && - !(cr2a & BIT(0)); - if (!fan6pin) - fan6pin = creb & BIT(3); - if (!pwm6pin) - pwm6pin = creb & BIT(2); + fan5pin |= creb & BIT(5); + pwm5pin |= (creb & BIT(4)) && !(cr2a & BIT(0)); + fan6pin |= creb & BIT(3); + pwm6pin |= creb & BIT(2); } if (data->kind == nct6795 || data->kind == nct6796) { - if (!fan6pin) - fan6pin = (cr2a & BIT(4)) && - (!dsw_en || (cred & BIT(4))); - if (!pwm6pin) - pwm6pin = (cr2a & BIT(3)) && - (cred & BIT(2)); + fan6pin |= (cr2a & BIT(4)) && + (!dsw_en || (cred & BIT(4))); + pwm6pin |= (cr2a & BIT(3)) && (cred & BIT(2)); } if (data->kind == nct6796) {