hwmon: (sis5595) Do PCI error checks on own line

Instead of if conditions with line splits, use the usual error handling
pattern with a separate variable to improve readability. Handle error
print with a label instead of trying to chain everything into a single
if condition.

No functional changes intended.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20230824132832.78705-14-ilpo.jarvinen@linux.intel.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index b0b05fd12221689cd77a48887dccc75cc4bceb0f..0a0479501e11344eb746cd36c158e5c63bcd130a 100644 (file)
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -798,7 +798,7 @@ static int sis5595_pci_probe(struct pci_dev *dev,
 {
        u16 address;
        u8 enable;
-       int *i;
+       int *i, err;
 
        for (i = blacklist; *i != 0; i++) {
                struct pci_dev *d;
@@ -818,8 +818,8 @@ static int sis5595_pci_probe(struct pci_dev *dev,
                pci_write_config_word(dev, SIS5595_BASE_REG, force_addr);
        }
 
-       if (PCIBIOS_SUCCESSFUL !=
-           pci_read_config_word(dev, SIS5595_BASE_REG, &address)) {
+       err = pci_read_config_word(dev, SIS5595_BASE_REG, &address);
+       if (err != PCIBIOS_SUCCESSFUL) {
                dev_err(&dev->dev, "Failed to read ISA address\n");
                return -ENODEV;
        }
@@ -836,22 +836,23 @@ static int sis5595_pci_probe(struct pci_dev *dev,
                return -ENODEV;
        }
 
-       if (PCIBIOS_SUCCESSFUL !=
-           pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable)) {
+       err = pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable);
+       if (err != PCIBIOS_SUCCESSFUL) {
                dev_err(&dev->dev, "Failed to read enable register\n");
                return -ENODEV;
        }
        if (!(enable & 0x80)) {
-               if ((PCIBIOS_SUCCESSFUL !=
-                    pci_write_config_byte(dev, SIS5595_ENABLE_REG,
-                                          enable | 0x80))
-                || (PCIBIOS_SUCCESSFUL !=
-                    pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable))
-                || (!(enable & 0x80))) {
-                       /* doesn't work for some chips! */
-                       dev_err(&dev->dev, "Failed to enable HWM device\n");
-                       return -ENODEV;
-               }
+               err = pci_write_config_byte(dev, SIS5595_ENABLE_REG, enable | 0x80);
+               if (err != PCIBIOS_SUCCESSFUL)
+                       goto enable_fail;
+
+               err = pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable);
+               if (err != PCIBIOS_SUCCESSFUL)
+                       goto enable_fail;
+
+               /* doesn't work for some chips! */
+               if (!(enable & 0x80))
+                       goto enable_fail;
        }
 
        if (platform_driver_register(&sis5595_driver)) {
@@ -871,6 +872,10 @@ static int sis5595_pci_probe(struct pci_dev *dev,
         */
        return -ENODEV;
 
+enable_fail:
+       dev_err(&dev->dev, "Failed to enable HWM device\n");
+       goto exit;
+
 exit_unregister:
        pci_dev_put(dev);
        platform_driver_unregister(&sis5595_driver);