| Message ID | 20230824132832.78705-10-ilpo.jarvinen@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | PCI/treewide: Cleanup/streamline PCI error code handling | expand |
Hi Ilpo, On Thu, Aug 24, 2023 at 04:28:27PM +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> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Thanks, Andi
On Thu, 24 Aug 2023 16:28:27 +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> > --- > drivers/i2c/busses/i2c-sis5595.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c > index c793a5c14cda..486f1e9dfb74 100644 > --- 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? */ Reviewed-by: Jean Delvare <jdelvare@suse.de> Thanks,
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c index c793a5c14cda..486f1e9dfb74 100644 --- 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? */
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/i2c/busses/i2c-sis5595.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)