]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i2c: via: Replace dev_err() with dev_err_probe() in probe function
authorEnrico Zanda <e.zanda1@gmail.com>
Tue, 15 Apr 2025 18:34:40 +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-4-e.zanda1@gmail.com
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-via.c

index 7ed29992a97ff87a3f31c296ced8dc9b3df5a08f..2c26a57883f2a1067530ead52a925c28f210ce59 100644 (file)
@@ -89,10 +89,9 @@ static int vt586b_probe(struct pci_dev *dev, const struct pci_device_id *id)
        u8 rev;
        int res;
 
-       if (pm_io_base) {
-               dev_err(&dev->dev, "i2c-via: Will only support one host\n");
-               return -ENODEV;
-       }
+       if (pm_io_base)
+               return dev_err_probe(&dev->dev, -ENODEV,
+                                    "Will only support one host\n");
 
        pci_read_config_byte(dev, PM_CFG_REVID, &rev);
 
@@ -113,10 +112,10 @@ static int vt586b_probe(struct pci_dev *dev, const struct pci_device_id *id)
        pci_read_config_word(dev, base, &pm_io_base);
        pm_io_base &= (0xff << 8);
 
-       if (!request_region(I2C_DIR, IOSPACE, vt586b_driver.name)) {
-               dev_err(&dev->dev, "IO 0x%x-0x%x already in use\n", I2C_DIR, I2C_DIR + IOSPACE);
-               return -ENODEV;
-       }
+       if (!request_region(I2C_DIR, IOSPACE, vt586b_driver.name))
+               return dev_err_probe(&dev->dev, -ENODEV,
+                                    "IO 0x%x-0x%x already in use\n",
+                                    I2C_DIR, I2C_DIR + IOSPACE);
 
        outb(inb(I2C_DIR) & ~(I2C_SDA | I2C_SCL), I2C_DIR);
        outb(inb(I2C_OUT) & ~(I2C_SDA | I2C_SCL), I2C_OUT);