[05/14] hwmon: (via686a) Do PCI error checks on own line

Message ID	20230824132832.78705-6-ilpo.jarvinen@linux.intel.com
State	New
Headers	show Return-Path: <linux-pci-owner@vger.kernel.org> From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com> To: linux-pci@vger.kernel.org, Bjorn Helgaas <helgaas@kernel.org>, Jean Delvare <jdelvare@suse.com>, Guenter Roeck <linux@roeck-us.net>, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com> Subject: [PATCH 05/14] hwmon: (via686a) Do PCI error checks on own line Date: Thu, 24 Aug 2023 16:28:23 +0300 Message-Id: <20230824132832.78705-6-ilpo.jarvinen@linux.intel.com> In-Reply-To: <20230824132832.78705-1-ilpo.jarvinen@linux.intel.com> References: <20230824132832.78705-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	PCI/treewide: Cleanup/streamline PCI error code handling \| expand [00/14] PCI/treewide: Cleanup/streamline PCI error code handling [01/14] alpha: Streamline convoluted PCI error handling [02/14] MIPS: TXx9: Do PCI error checks on own line [03/14] sh: pci: Do PCI error check on own line [04/14] atm: iphase: Do PCI error checks on own line [05/14] hwmon: (via686a) Do PCI error checks on own line [06/14] hwmon: (vt8231) Do PCI error checks on own line [07/14] I2C: ali15x3: Do PCI error checks on own line [08/14] I2C: nforce2: Do PCI error check on own line [09/14] I2C: sis5595: Do PCI error checks on own line [10/14] PCI: Do error check on own line to split long if conditions [11/14] PCI: xgene: Do PCI error check on own line [12/14] scsi: ipr: Do PCI error checks on own line [13/14] hwmon: (sis5595) Do PCI error checks on own line [14/14] perf/x86/uncore: Remove unnecessary ?: operator around pcibios_err_to_errno() call

Message ID

20230824132832.78705-6-ilpo.jarvinen@linux.intel.com

State

New

Headers

From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
To: linux-pci@vger.kernel.org, Bjorn Helgaas <helgaas@kernel.org>,
        Jean Delvare <jdelvare@suse.com>,
        Guenter Roeck <linux@roeck-us.net>,
        linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH 05/14] hwmon: (via686a) Do PCI error checks on own line
Date: Thu, 24 Aug 2023 16:28:23 +0300
Message-Id: <20230824132832.78705-6-ilpo.jarvinen@linux.intel.com>
In-Reply-To: <20230824132832.78705-1-ilpo.jarvinen@linux.intel.com>
References: <20230824132832.78705-1-ilpo.jarvinen@linux.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

PCI/treewide: Cleanup/streamline PCI error code handling | expand

Commit Message

Ilpo Järvinen Aug. 24, 2023, 1:28 p.m. UTC

Instead of if conditions with line splits, use the usual error handling
pattern with a separate variable to improve readability.

No functional changes intended.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
 drivers/hwmon/via686a.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Guenter Roeck Aug. 25, 2023, 1:18 p.m. UTC | #1

On Thu, Aug 24, 2023 at 04:28:23PM +0300, Ilpo Järvinen wrote:
> Instead of if conditions with line splits, use the usual error handling
> pattern with a separate variable to improve readability.
> 
> No functional changes intended.
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

Applied.

Thanks,
Guenter

diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 37d7374896f6..407933d6e425 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -855,16 +855,17 @@  static int via686a_pci_probe(struct pci_dev *dev,
 				       const struct pci_device_id *id)
 {
 	u16 address, val;
+	int ret;
 
 	if (force_addr) {
 		address = force_addr & ~(VIA686A_EXTENT - 1);
 		dev_warn(&dev->dev, "Forcing ISA address 0x%x\n", address);
-		if (PCIBIOS_SUCCESSFUL !=
-		    pci_write_config_word(dev, VIA686A_BASE_REG, address | 1))
+		ret = pci_write_config_word(dev, VIA686A_BASE_REG, address | 1);
+		if (ret != PCIBIOS_SUCCESSFUL)
 			return -ENODEV;
 	}
-	if (PCIBIOS_SUCCESSFUL !=
-	    pci_read_config_word(dev, VIA686A_BASE_REG, &val))
+	ret = pci_read_config_word(dev, VIA686A_BASE_REG, &val);
+	if (ret != PCIBIOS_SUCCESSFUL)
 		return -ENODEV;
 
 	address = val & ~(VIA686A_EXTENT - 1);
@@ -874,8 +875,8 @@  static int via686a_pci_probe(struct pci_dev *dev,
 		return -ENODEV;
 	}
 
-	if (PCIBIOS_SUCCESSFUL !=
-	    pci_read_config_word(dev, VIA686A_ENABLE_REG, &val))
+	ret = pci_read_config_word(dev, VIA686A_ENABLE_REG, &val);
+	if (ret != PCIBIOS_SUCCESSFUL)
 		return -ENODEV;
 	if (!(val & 0x0001)) {
 		if (!force_addr) {
@@ -886,9 +887,8 @@  static int via686a_pci_probe(struct pci_dev *dev,
 		}
 
 		dev_warn(&dev->dev, "Enabling sensors\n");
-		if (PCIBIOS_SUCCESSFUL !=
-		    pci_write_config_word(dev, VIA686A_ENABLE_REG,
-					  val | 0x0001))
+		ret = pci_write_config_word(dev, VIA686A_ENABLE_REG, val | 0x1);
+		if (ret != PCIBIOS_SUCCESSFUL)
 			return -ENODEV;
 	}

[05/14] hwmon: (via686a) Do PCI error checks on own line

Commit Message

Comments

Patch