mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 15:47:36 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Ilpo Järvinen 2023-08-24 16:28:31 +03:00 committed by Guenter Roeck
parent 1e3c3a7989
commit a1f38987dd
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/hwmon/sis5595.c
View file

@ -798,7 +798,7 @@ static int sis5595_pci_probe(struct pci_dev *dev,
{ {
u16 address; u16 address;
u8 enable; u8 enable;
int *i; int *i, err;
for (i = blacklist; *i != 0; i++) { for (i = blacklist; *i != 0; i++) {
struct pci_dev *d; 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); pci_write_config_word(dev, SIS5595_BASE_REG, force_addr);
} }
if (PCIBIOS_SUCCESSFUL != err = pci_read_config_word(dev, SIS5595_BASE_REG, &address);
pci_read_config_word(dev, SIS5595_BASE_REG, &address)) { if (err != PCIBIOS_SUCCESSFUL) {
dev_err(&dev->dev, "Failed to read ISA address\n"); dev_err(&dev->dev, "Failed to read ISA address\n");
return -ENODEV; return -ENODEV;
} }
@ -836,22 +836,23 @@ static int sis5595_pci_probe(struct pci_dev *dev,
return -ENODEV; return -ENODEV;
} }
if (PCIBIOS_SUCCESSFUL != err = pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable);
pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable)) { if (err != PCIBIOS_SUCCESSFUL) {
dev_err(&dev->dev, "Failed to read enable register\n"); dev_err(&dev->dev, "Failed to read enable register\n");
return -ENODEV; return -ENODEV;
} }
if (!(enable & 0x80)) { if (!(enable & 0x80)) {
if ((PCIBIOS_SUCCESSFUL != err = pci_write_config_byte(dev, SIS5595_ENABLE_REG, enable | 0x80);
pci_write_config_byte(dev, SIS5595_ENABLE_REG, if (err != PCIBIOS_SUCCESSFUL)
enable | 0x80)) goto enable_fail;
|| (PCIBIOS_SUCCESSFUL !=
pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable)) err = pci_read_config_byte(dev, SIS5595_ENABLE_REG, &enable);
|| (!(enable & 0x80))) { if (err != PCIBIOS_SUCCESSFUL)
/* doesn't work for some chips! */ goto enable_fail;
dev_err(&dev->dev, "Failed to enable HWM device\n");
return -ENODEV; /* doesn't work for some chips! */
} if (!(enable & 0x80))
goto enable_fail;
} }
if (platform_driver_register(&sis5595_driver)) { if (platform_driver_register(&sis5595_driver)) {
@ -871,6 +872,10 @@ static int sis5595_pci_probe(struct pci_dev *dev,
*/ */
return -ENODEV; return -ENODEV;
enable_fail:
dev_err(&dev->dev, "Failed to enable HWM device\n");
goto exit;
exit_unregister: exit_unregister:
pci_dev_put(dev); pci_dev_put(dev);
platform_driver_unregister(&sis5595_driver); platform_driver_unregister(&sis5595_driver);