i2c: 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.

No functional changes intended.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index c793a5c14cda1bdbc8ee402e1efaf3d06eb0a700..486f1e9dfb74aabff9b29ae39f9b37d16b0444a9 100644 (file)
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -175,11 +175,11 @@ static int sis5595_setup(struct pci_dev *SIS5595_dev)
 
        if (force_addr) {
                dev_info(&SIS5595_dev->dev, "forcing ISA address 0x%04X\n", sis5595_base);
-               if (pci_write_config_word(SIS5595_dev, ACPI_BASE, sis5595_base)
-                   != PCIBIOS_SUCCESSFUL)
+               retval = pci_write_config_word(SIS5595_dev, ACPI_BASE, sis5595_base);
+               if (retval != PCIBIOS_SUCCESSFUL)
                        goto error;
-               if (pci_read_config_word(SIS5595_dev, ACPI_BASE, &a)
-                   != PCIBIOS_SUCCESSFUL)
+               retval = pci_read_config_word(SIS5595_dev, ACPI_BASE, &a);
+               if (retval != PCIBIOS_SUCCESSFUL)
                        goto error;
                if ((a & ~(SIS5595_EXTENT - 1)) != sis5595_base) {
                        /* doesn't work for some chips! */
@@ -188,16 +188,16 @@ static int sis5595_setup(struct pci_dev *SIS5595_dev)
                }
        }
 
-       if (pci_read_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, &val)
-           != PCIBIOS_SUCCESSFUL)
+       retval = pci_read_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, &val);
+       if (retval != PCIBIOS_SUCCESSFUL)
                goto error;
        if ((val & 0x80) == 0) {
                dev_info(&SIS5595_dev->dev, "enabling ACPI\n");
-               if (pci_write_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, val | 0x80)
-                   != PCIBIOS_SUCCESSFUL)
+               retval = pci_write_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, val | 0x80);
+               if (retval != PCIBIOS_SUCCESSFUL)
                        goto error;
-               if (pci_read_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, &val)
-                   != PCIBIOS_SUCCESSFUL)
+               retval = pci_read_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, &val);
+               if (retval != PCIBIOS_SUCCESSFUL)
                        goto error;
                if ((val & 0x80) == 0) {
                        /* doesn't work for some chips? */