Commit bfefbecd authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Lee Jones

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: default avatarThomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/r/20240526-cros_ec-kbd-led-framework-v3-1-ee577415a521@weissschuh.netSigned-off-by: default avatarLee Jones <lee@kernel.org>
parent 1613e604
...@@ -503,6 +503,9 @@ int led_classdev_register_ext(struct device *parent, ...@@ -503,6 +503,9 @@ int led_classdev_register_ext(struct device *parent,
ret = led_classdev_next_name(proposed_name, final_name, sizeof(final_name)); ret = led_classdev_next_name(proposed_name, final_name, sizeof(final_name));
if (ret < 0) if (ret < 0)
return ret; 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) if (led_cdev->color >= LED_COLOR_ID_MAX)
dev_warn(parent, "LED %s color identifier out of range\n", final_name); 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, ...@@ -518,10 +521,6 @@ int led_classdev_register_ext(struct device *parent,
if (init_data && init_data->fwnode) if (init_data && init_data->fwnode)
device_set_node(led_cdev->dev, 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) { if (led_cdev->flags & LED_BRIGHT_HW_CHANGED) {
ret = led_add_brightness_hw_changed(led_cdev); ret = led_add_brightness_hw_changed(led_cdev);
if (ret) { if (ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment