]> www.infradead.org Git - users/willy/xarray.git/commitdiff
i2c: viapro: Replace dev_err() with dev_err_probe() in probe function
authorEnrico Zanda <e.zanda1@gmail.com>
Tue, 15 Apr 2025 18:34:42 +0000 (20:34 +0200)
committerAndi Shyti <andi@smida.it>
Mon, 19 May 2025 20:23:55 +0000 (22:23 +0200)
This simplifies the code while improving log.

Signed-off-by: Enrico Zanda <e.zanda1@gmail.com>
Link: https://lore.kernel.org/r/20250415183447.396277-6-e.zanda1@gmail.com
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-viapro.c

index 2cc7bba3b8bf8d2f64c4ad1098927e2a2f5a269f..c58843609107038fa44ad7ccb8883bc0c116e5e4 100644 (file)
@@ -330,30 +330,27 @@ static int vt596_probe(struct pci_dev *pdev,
                        SMBHSTCFG = 0x84;
                } else {
                        /* no matches at all */
-                       dev_err(&pdev->dev, "Cannot configure "
-                               "SMBus I/O Base address\n");
-                       return -ENODEV;
+                       return dev_err_probe(&pdev->dev, -ENODEV,
+                                            "Cannot configure "
+                                            "SMBus I/O Base address\n");
                }
        }
 
        vt596_smba &= 0xfff0;
-       if (vt596_smba == 0) {
-               dev_err(&pdev->dev, "SMBus base address "
-                       "uninitialized - upgrade BIOS or use "
-                       "force_addr=0xaddr\n");
-               return -ENODEV;
-       }
+       if (vt596_smba == 0)
+               return dev_err_probe(&pdev->dev, -ENODEV, "SMBus base address "
+                                    "uninitialized - upgrade BIOS or use "
+                                    "force_addr=0xaddr\n");
 
 found:
        error = acpi_check_region(vt596_smba, 8, vt596_driver.name);
        if (error)
                return -ENODEV;
 
-       if (!request_region(vt596_smba, 8, vt596_driver.name)) {
-               dev_err(&pdev->dev, "SMBus region 0x%x already in use!\n",
-                       vt596_smba);
-               return -ENODEV;
-       }
+       if (!request_region(vt596_smba, 8, vt596_driver.name))
+               return dev_err_probe(&pdev->dev, -ENODEV,
+                                    "SMBus region 0x%x already in use!\n",
+                                    vt596_smba);
 
        pci_read_config_byte(pdev, SMBHSTCFG, &temp);
        /* If force_addr is set, we program the new address here. Just to make
@@ -375,10 +372,10 @@ found:
                        pci_write_config_byte(pdev, SMBHSTCFG, temp | 0x01);
                        dev_info(&pdev->dev, "Enabling SMBus device\n");
                } else {
-                       dev_err(&pdev->dev, "SMBUS: Error: Host SMBus "
-                               "controller not enabled! - upgrade BIOS or "
-                               "use force=1\n");
-                       error = -ENODEV;
+                       error = dev_err_probe(&pdev->dev, -ENODEV,
+                                             "SMBUS: Error: Host SMBus "
+                                             "controller not enabled! - "
+                                             "upgrade BIOS or use force=1\n");
                        goto release_region;
                }
        }