]> git.itanic.dy.fi Git - linux-stable/commitdiff
hwmon: (via686a) Do PCI error checks on own line
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Thu, 24 Aug 2023 13:28:23 +0000 (16:28 +0300)
committerGuenter Roeck <linux@roeck-us.net>
Fri, 25 Aug 2023 13:18:09 +0000 (06:18 -0700)
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>
Link: https://lore.kernel.org/r/20230824132832.78705-6-ilpo.jarvinen@linux.intel.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/via686a.c

index 37d7374896f672bba9a2319114d96def5cdc805e..407933d6e42556928d428183e2a56634698d18db 100644 (file)
@@ -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;
        }