]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
eeprom: at24: use dev_err_probe() consistently
authorBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Fri, 12 Dec 2025 03:26:46 +0000 (04:26 +0100)
committerBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Wed, 17 Dec 2025 09:22:24 +0000 (10:22 +0100)
Save some lines by consistently using dev_err_probe() when bailing out
with an error message.

Link: https://lore.kernel.org/r/20251212032646.49336-1-bartosz.golaszewski@oss.qualcomm.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
drivers/misc/eeprom/at24.c

index f721825199ce92a503c4e75ad2159810ab1a16de..0200288d3a7abf2b54f980f094aa25294687acfc 100644 (file)
@@ -657,10 +657,8 @@ static int at24_probe(struct i2c_client *client)
        if (!i2c_fn_i2c && !i2c_fn_block)
                page_size = 1;
 
-       if (!page_size) {
-               dev_err(dev, "page_size must not be 0!\n");
-               return -EINVAL;
-       }
+       if (!page_size)
+               return dev_err_probe(dev, -EINVAL, "page_size must not be 0!\n");
 
        if (!is_power_of_2(page_size))
                dev_warn(dev, "page_size looks suspicious (no power of 2)!\n");
@@ -674,11 +672,9 @@ static int at24_probe(struct i2c_client *client)
                                (flags & AT24_FLAG_ADDR16) ? 65536 : 256);
        }
 
-       if ((flags & AT24_FLAG_SERIAL) && (flags & AT24_FLAG_MAC)) {
-               dev_err(dev,
-                       "invalid device data - cannot have both AT24_FLAG_SERIAL & AT24_FLAG_MAC.");
-               return -EINVAL;
-       }
+       if ((flags & AT24_FLAG_SERIAL) && (flags & AT24_FLAG_MAC))
+               return dev_err_probe(dev, -EINVAL,
+                                    "invalid device data - cannot have both AT24_FLAG_SERIAL & AT24_FLAG_MAC.");
 
        regmap_config.val_bits = 8;
        regmap_config.reg_bits = (flags & AT24_FLAG_ADDR16) ? 16 : 8;
@@ -759,10 +755,8 @@ static int at24_probe(struct i2c_client *client)
        full_power = acpi_dev_state_d0(&client->dev);
        if (full_power) {
                err = regulator_enable(at24->vcc_reg);
-               if (err) {
-                       dev_err(dev, "Failed to enable vcc regulator\n");
-                       return err;
-               }
+               if (err)
+                       return dev_err_probe(dev, err, "Failed to enable vcc regulator\n");
 
                pm_runtime_set_active(dev);
        }