Skip to content

Commit eda057c

Browse files
elkablolag-linaro
authored andcommitted
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>
1 parent 2de889e commit eda057c

File tree

1 file changed

+16
-34
lines changed

1 file changed

+16
-34
lines changed

drivers/leds/leds-turris-omnia.c

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -255,33 +255,23 @@ static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
255255
/* put the LED into software mode */
256256
ret = omnia_cmd_write_u8(client, OMNIA_CMD_LED_MODE, OMNIA_CMD_LED_MODE_LED(led->reg) |
257257
OMNIA_CMD_LED_MODE_USER);
258-
if (ret) {
259-
dev_err(dev, "Cannot set LED %pOF to software mode: %i\n", np,
260-
ret);
261-
return ret;
262-
}
258+
if (ret)
259+
return dev_err_probe(dev, ret, "Cannot set LED %pOF to software mode\n", np);
263260

264261
/* disable the LED */
265262
ret = omnia_cmd_write_u8(client, OMNIA_CMD_LED_STATE, OMNIA_CMD_LED_STATE_LED(led->reg));
266-
if (ret) {
267-
dev_err(dev, "Cannot set LED %pOF brightness: %i\n", np, ret);
268-
return ret;
269-
}
263+
if (ret)
264+
return dev_err_probe(dev, ret, "Cannot set LED %pOF brightness\n", np);
270265

271266
/* Set initial color and cache it */
272267
ret = omnia_led_send_color_cmd(client, led);
273-
if (ret < 0) {
274-
dev_err(dev, "Cannot set LED %pOF initial color: %i\n", np,
275-
ret);
276-
return ret;
277-
}
268+
if (ret < 0)
269+
return dev_err_probe(dev, ret, "Cannot set LED %pOF initial color\n", np);
278270

279271
ret = devm_led_classdev_multicolor_register_ext(dev, &led->mc_cdev,
280272
&init_data);
281-
if (ret < 0) {
282-
dev_err(dev, "Cannot register LED %pOF: %i\n", np, ret);
283-
return ret;
284-
}
273+
if (ret < 0)
274+
return dev_err_probe(dev, ret, "Cannot register LED %pOF\n", np);
285275

286276
return 1;
287277
}
@@ -484,13 +474,10 @@ static int omnia_leds_probe(struct i2c_client *client)
484474
int ret, count;
485475

486476
count = of_get_available_child_count(np);
487-
if (!count) {
488-
dev_err(dev, "LEDs are not defined in device tree!\n");
489-
return -ENODEV;
490-
} else if (count > OMNIA_BOARD_LEDS) {
491-
dev_err(dev, "Too many LEDs defined in device tree!\n");
492-
return -EINVAL;
493-
}
477+
if (count == 0)
478+
return dev_err_probe(dev, -ENODEV, "LEDs are not defined in device tree!\n");
479+
if (count > OMNIA_BOARD_LEDS)
480+
return dev_err_probe(dev, -EINVAL, "Too many LEDs defined in device tree!\n");
494481

495482
leds = devm_kzalloc(dev, struct_size(leds, leds, count), GFP_KERNEL);
496483
if (!leds)
@@ -500,11 +487,8 @@ static int omnia_leds_probe(struct i2c_client *client)
500487
i2c_set_clientdata(client, leds);
501488

502489
ret = omnia_find_mcu_and_get_features(dev);
503-
if (ret < 0) {
504-
dev_err(dev, "Cannot determine MCU supported features: %d\n",
505-
ret);
506-
return ret;
507-
}
490+
if (ret < 0)
491+
return dev_err_probe(dev, ret, "Cannot determine MCU supported features\n");
508492

509493
leds->has_gamma_correction = ret & OMNIA_FEAT_LED_GAMMA_CORRECTION;
510494

@@ -517,10 +501,8 @@ static int omnia_leds_probe(struct i2c_client *client)
517501
mutex_init(&leds->lock);
518502

519503
ret = devm_led_trigger_register(dev, &omnia_hw_trigger);
520-
if (ret < 0) {
521-
dev_err(dev, "Cannot register private LED trigger: %d\n", ret);
522-
return ret;
523-
}
504+
if (ret < 0)
505+
return dev_err_probe(dev, ret, "Cannot register private LED trigger\n");
524506

525507
led = &leds->leds[0];
526508
for_each_available_child_of_node_scoped(np, child) {

0 commit comments

Comments
 (0)