leds: turris-omnia: Use dev_err_probe() where appropriate

Use dev_err_probe() instead of dev_err() + separate return where
appropriate.

Signed-off-by: Marek Behún <kabel@kernel.org>
Link: https://lore.kernel.org/r/20241111100355.6978-11-kabel@kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/leds/leds-turris-omnia.c b/drivers/leds/leds-turris-omnia.c
index cfbcbdd7921b0aaf215c3a1802c697faf47c4848..bb40cc3c874a6bcba379d5f80288e7f90d4f406f 100644 (file)
--- a/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c
@@ -255,33 +255,23 @@ static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
        /* put the LED into software mode */
        ret = omnia_cmd_write_u8(client, OMNIA_CMD_LED_MODE, OMNIA_CMD_LED_MODE_LED(led->reg) |
                                                             OMNIA_CMD_LED_MODE_USER);
-       if (ret) {
-               dev_err(dev, "Cannot set LED %pOF to software mode: %i\n", np,
-                       ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Cannot set LED %pOF to software mode\n", np);
 
        /* disable the LED */
        ret = omnia_cmd_write_u8(client, OMNIA_CMD_LED_STATE, OMNIA_CMD_LED_STATE_LED(led->reg));
-       if (ret) {
-               dev_err(dev, "Cannot set LED %pOF brightness: %i\n", np, ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Cannot set LED %pOF brightness\n", np);
 
        /* Set initial color and cache it */
        ret = omnia_led_send_color_cmd(client, led);
-       if (ret < 0) {
-               dev_err(dev, "Cannot set LED %pOF initial color: %i\n", np,
-                       ret);
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(dev, ret, "Cannot set LED %pOF initial color\n", np);
 
        ret = devm_led_classdev_multicolor_register_ext(dev, &led->mc_cdev,
                                                        &init_data);
-       if (ret < 0) {
-               dev_err(dev, "Cannot register LED %pOF: %i\n", np, ret);
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(dev, ret, "Cannot register LED %pOF\n", np);
 
        return 1;
 }
@@ -484,13 +474,10 @@ static int omnia_leds_probe(struct i2c_client *client)
        int ret, count;
 
        count = of_get_available_child_count(np);
-       if (!count) {
-               dev_err(dev, "LEDs are not defined in device tree!\n");
-               return -ENODEV;
-       } else if (count > OMNIA_BOARD_LEDS) {
-               dev_err(dev, "Too many LEDs defined in device tree!\n");
-               return -EINVAL;
-       }
+       if (count == 0)
+               return dev_err_probe(dev, -ENODEV, "LEDs are not defined in device tree!\n");
+       if (count > OMNIA_BOARD_LEDS)
+               return dev_err_probe(dev, -EINVAL, "Too many LEDs defined in device tree!\n");
 
        leds = devm_kzalloc(dev, struct_size(leds, leds, count), GFP_KERNEL);
        if (!leds)
@@ -500,11 +487,8 @@ static int omnia_leds_probe(struct i2c_client *client)
        i2c_set_clientdata(client, leds);
 
        ret = omnia_find_mcu_and_get_features(dev);
-       if (ret < 0) {
-               dev_err(dev, "Cannot determine MCU supported features: %d\n",
-                       ret);
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(dev, ret, "Cannot determine MCU supported features\n");
 
        leds->has_gamma_correction = ret & OMNIA_FEAT_LED_GAMMA_CORRECTION;
 
@@ -517,10 +501,8 @@ static int omnia_leds_probe(struct i2c_client *client)
        mutex_init(&leds->lock);
 
        ret = devm_led_trigger_register(dev, &omnia_hw_trigger);
-       if (ret < 0) {
-               dev_err(dev, "Cannot register private LED trigger: %d\n", ret);
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(dev, ret, "Cannot register private LED trigger\n");
 
        led = &leds->leds[0];
        for_each_available_child_of_node_scoped(np, child) {