mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-05 11:01:06 -04:00
leds: class: Warn about name collisions earlier
Other warnings refer to the name after renaming, which is clearer when that name is mentioned first. It is also clearer where "ret" comes from. While at it, also add the necessary newline to the message and fix the parameter alignment. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Link: https://lore.kernel.org/r/20240526-cros_ec-kbd-led-framework-v3-1-ee577415a521@weissschuh.net Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
committed by
Lee Jones
parent
1613e604df
commit
bfefbecdea
@@ -503,6 +503,9 @@ int led_classdev_register_ext(struct device *parent,
|
||||
ret = led_classdev_next_name(proposed_name, final_name, sizeof(final_name));
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
else if (ret)
|
||||
dev_warn(parent, "Led %s renamed to %s due to name collision\n",
|
||||
proposed_name, final_name);
|
||||
|
||||
if (led_cdev->color >= LED_COLOR_ID_MAX)
|
||||
dev_warn(parent, "LED %s color identifier out of range\n", final_name);
|
||||
@@ -518,10 +521,6 @@ int led_classdev_register_ext(struct device *parent,
|
||||
if (init_data && init_data->fwnode)
|
||||
device_set_node(led_cdev->dev, init_data->fwnode);
|
||||
|
||||
if (ret)
|
||||
dev_warn(parent, "Led %s renamed to %s due to name collision",
|
||||
proposed_name, dev_name(led_cdev->dev));
|
||||
|
||||
if (led_cdev->flags & LED_BRIGHT_HW_CHANGED) {
|
||||
ret = led_add_brightness_hw_changed(led_cdev);
|
||||
if (ret) {
|
||||
|
||||
Reference in New Issue
Block a user