From patchwork Thu Sep 20 13:45:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10607775 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 19F97157B for ; Thu, 20 Sep 2018 13:45:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0015D2D741 for ; Thu, 20 Sep 2018 13:45:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7B9F2D74D; Thu, 20 Sep 2018 13:45:47 +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 5AC212D741 for ; Thu, 20 Sep 2018 13:45:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727710AbeITT3U (ORCPT ); Thu, 20 Sep 2018 15:29:20 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:35165 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727242AbeITT3U (ORCPT ); Thu, 20 Sep 2018 15:29:20 -0400 Received: by mail-pl1-f195.google.com with SMTP id g2-v6so4389450plo.2 for ; Thu, 20 Sep 2018 06:45:46 -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; bh=wkjR9+nQdrJACBFMmtoNDV7f+Ynf6Nvbn0UuPGd5MA4=; b=M490evZIFmLu74Yj+uPquq+pm0rfeGfzZltu161PSNQvPM2OMd2aw9tiZf1Fslys8l Lr1lyCbxBQo4w/8ez9An/hKR0re3lakoyMy1kxXnPR8P/doHJeY48eGMgbEmWCc5SLOm LoFNEYm49j12jy+JOnIlXd3ZUttCrGJs0eUDPKEDY8jpU/Id2DuaZhFc1Jw03P5ZgK2b LI8q0cNj5O35horMWMXyvBhQo5OIdhBuTXU53FjPRneE5CY4qdxCM7WO3WIQViFE7Cl3 A0Py2Gonc13F5A3pSLs+wNiiNMpIIrn+2vBBAKsngkk7HIZxUSU1Qh4fxE4TrJ1T5MUb OOGA== 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; bh=wkjR9+nQdrJACBFMmtoNDV7f+Ynf6Nvbn0UuPGd5MA4=; b=NOBV/nGxK1A3VG/f4yVKHcIlpV2Bqgjk0eKka8PI9qYDjlTqubSfjno0ulTTJJulNX suqWkjlDKt5OzrYSUly8FDbP5we+CxzlgiD48QdVRVl/rvdhZ7oYwozV1Dy8nrXDa7k1 /u3CeHFnSrqDqAj8iMlZQKQC5z+0Yve8NImSXmvX0QUMMQBMrMXoiaGNDCsypCOyL8NI 918Iv4P61xtWlHgy+ugND7VuvbeM45bw6LJWIFmrq4YHkxFrCoHFBhvZHY4PkpBvBfEb fA+GYrhOYfSTYTMmq9WulaNf74pb0XedMEaSHkVQPrVizqNbC6ePp8dd6hBo0in5W14d /aUA== X-Gm-Message-State: APzg51CMd+6ECY6N78clScp6u2tsquIP4eqjV82UlmBQpaP0Bzoo8TKa V9L1mGSL9atu5DnzQPDyLplRqk7p X-Google-Smtp-Source: ANB0VdbWDmb5oWjwO4FDzws+IQ0h73onXzzrXLPcDtBR/sFvjv1wacQZnSZWwRJIby41hCl6VJ6umw== X-Received: by 2002:a17:902:d24:: with SMTP id 33-v6mr39092828plu.211.1537451146110; Thu, 20 Sep 2018 06:45:46 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id u13-v6sm33066125pfn.59.2018.09.20.06.45.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Sep 2018 06:45:45 -0700 (PDT) From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 01/13] hwmon: (nct6775) Rename configuration register variables Date: Thu, 20 Sep 2018 06:45:29 -0700 Message-Id: <1537451141-27242-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 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 variable names from chip datasheets (crXX) instead of regval_XX for configuration register variables. This is shorter and, together with subsequent changes, makes the code easier to read. No functional change. Signed-off-by: Guenter Roeck --- drivers/hwmon/nct6775.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 2a9fc8c9fb9e..7a3a1d59553e 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -3497,7 +3497,7 @@ nct6775_check_fan_inputs(struct nct6775_data *data) pwm3pin = regval & 0x08; } else { /* NCT6779D, NCT6791D, NCT6792D, NCT6793D, NCT6795D, NCT6796D */ - int regval_1b, regval_2a, regval_2f; + int cr1b, cr2a, cr2f; bool dsw_en; regval = superio_inb(sioreg, 0x1c); @@ -3520,20 +3520,20 @@ nct6775_check_fan_inputs(struct nct6775_data *data) case nct6793: case nct6795: case nct6796: - regval_1b = superio_inb(sioreg, 0x1b); - regval_2a = superio_inb(sioreg, 0x2a); - regval_2f = superio_inb(sioreg, 0x2f); - dsw_en = regval_2f & BIT(3); + cr1b = superio_inb(sioreg, 0x1b); + cr2a = superio_inb(sioreg, 0x2a); + cr2f = superio_inb(sioreg, 0x2f); + dsw_en = cr2f & BIT(3); if (!pwm5pin) pwm5pin = regval & BIT(7); if (!fan5pin) - fan5pin = regval_1b & BIT(5); + fan5pin = cr1b & BIT(5); superio_select(sioreg, NCT6775_LD_12); if (data->kind != nct6796) { - int regval_eb = superio_inb(sioreg, 0xeb); + int creb = superio_inb(sioreg, 0xeb); if (!dsw_en) { fan6pin = regval & BIT(1); @@ -3541,33 +3541,33 @@ nct6775_check_fan_inputs(struct nct6775_data *data) } if (!fan5pin) - fan5pin = regval_eb & BIT(5); + fan5pin = creb & BIT(5); if (!pwm5pin) - pwm5pin = (regval_eb & BIT(4)) && - !(regval_2a & BIT(0)); + pwm5pin = (creb & BIT(4)) && + !(cr2a & BIT(0)); if (!fan6pin) - fan6pin = regval_eb & BIT(3); + fan6pin = creb & BIT(3); if (!pwm6pin) - pwm6pin = regval_eb & BIT(2); + pwm6pin = creb & BIT(2); } if (data->kind == nct6795 || data->kind == nct6796) { - int regval_ed = superio_inb(sioreg, 0xed); + int cred = superio_inb(sioreg, 0xed); if (!fan6pin) - fan6pin = (regval_2a & BIT(4)) && - (!dsw_en || (regval_ed & BIT(4))); + fan6pin = (cr2a & BIT(4)) && + (!dsw_en || (cred & BIT(4))); if (!pwm6pin) - pwm6pin = (regval_2a & BIT(3)) && - (regval_ed & BIT(2)); + pwm6pin = (cr2a & BIT(3)) && + (cred & BIT(2)); } if (data->kind == nct6796) { - int regval_1d = superio_inb(sioreg, 0x1d); - int regval_2b = superio_inb(sioreg, 0x2b); + int cr1d = superio_inb(sioreg, 0x1d); + int cr2b = superio_inb(sioreg, 0x2b); - fan7pin = !(regval_2b & BIT(2)); - pwm7pin = !(regval_1d & (BIT(2) | BIT(3))); + fan7pin = !(cr2b & BIT(2)); + pwm7pin = !(cr1d & (BIT(2) | BIT(3))); } break;