Re: [PATCH 07/14] I2C: ali15x3: Do PCI error checks on own line

Andi Shyti
2023-08-24T16:01:09Z

Hi Ilpo,

On Thu, Aug 24, 2023 at 04:28:25PM +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-ali15x3.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
> index cc58feacd082..6fedecef9df3 100644
> --- a/drivers/i2c/busses/i2c-ali15x3.c
> +++ b/drivers/i2c/busses/i2c-ali15x3.c
> @@ -122,6 +122,7 @@ static int ali15x3_setup(struct pci_dev *ALI15X3_dev)
> {
> u16 a;
> unsigned char temp;
> + int ret;

can you please add this ret declaration inside the
"if (force_addr)"?

Andi

>
> /* Check the following things:
> - SMB I/O address is initialized
> @@ -167,12 +168,11 @@ static int ali15x3_setup(struct pci_dev *ALI15X3_dev)
> if(force_addr) {
> dev_info(&ALI15X3_dev->dev, "forcing ISA address 0x%04X\n",
> ali15x3_smba);
> - if (PCIBIOS_SUCCESSFUL != pci_write_config_word(ALI15X3_dev,
> - SMBBA,
> - ali15x3_smba))
> + ret = pci_write_config_word(ALI15X3_dev, SMBBA, ali15x3_smba);
> + if (ret != PCIBIOS_SUCCESSFUL)
> goto error;
> - if (PCIBIOS_SUCCESSFUL != pci_read_config_word(ALI15X3_dev,
> - SMBBA, &a))
> + ret = pci_read_config_word(ALI15X3_dev, SMBBA, &a);
> + if (ret != PCIBIOS_SUCCESSFUL)
> goto error;
> if ((a & ~(ALI15X3_SMB_IOSIZE - 1)) != ali15x3_smba) {
> /* make sure it works */
> --
> 2.30.2
>