Skip to contentSkip to conversation

leds: core: Fix warning message when init_data

PATCH Applied Ricardo Ribalda Delgado 3 participants 3 messages Apr 1, 2020 – Apr 6, 2020 LED

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 leds: core: Fix warning message when init_data

The warning message when a led is renamed due to name collition can fail to show proper original name if init_data is used. Eg:

[    9.073996] leds-gpio a0040000.leds_0: Led (null) renamed to red_led_1 due to name collision
Fixes bb4e9af0348d ("leds: core: Add support for composing LED class device names")
---
 drivers/leds/led-class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/led-class.c +1 -1
index 1fc40e8af75e..3363a6551a70 100644
@@ -376,7 +376,7 @@ int led_classdev_register_ext(struct device *parent,
 
 	if (ret)
 		dev_warn(parent, "Led %s renamed to %s due to name collision",
-				led_cdev->name, dev_name(led_cdev->dev));
+				proposed_name, dev_name(led_cdev->dev));
 
 	if (led_cdev->flags & LED_BRIGHT_HW_CHANGED) {
 		ret = led_add_brightness_hw_changed(led_cdev);
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#1 lore raw

Hi Ricardo,

Thank you for the patch.

Quoted 17 lines · Ricardo Ribalda Delgado

The warning message when a led is renamed due to name collition can fail to show proper original name if init_data is used. Eg:

[    9.073996] leds-gpio a0040000.leds_0: Led (null) renamed to red_led_1 due to name collision
Fixes bb4e9af0348d ("leds: core: Add support for composing LED class device names")
---
 drivers/leds/led-class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/led-class.c +0 -0
index 1fc40e8af75e..3363a6551a70 100644

drivers/leds/led-class.c int led_classdev_register_ext(struct device *parent, · line 382

Quoted 8 lines
drivers/leds/led-class.c +1 -1
@@ -376,7 +376,7 @@ int led_classdev_register_ext(struct device *parent,
 
 	if (ret)
 		dev_warn(parent, "Led %s renamed to %s due to name collision",
-				led_cdev->name, dev_name(led_cdev->dev));
+				proposed_name, dev_name(led_cdev->dev));
 
 	if (led_cdev->flags & LED_BRIGHT_HW_CHANGED) {
 		ret = led_add_brightness_hw_changed(led_cdev);
Signature · 2 lines
Best regards,
Jacek Anaszewski
Applied
#2 lore raw
Quoted 27 lines · Jacek Anaszewski

Hi Ricardo,

Thank you for the patch.

Quoted 22 lines · Ricardo Ribalda Delgado

The warning message when a led is renamed due to name collition can fail to show proper original name if init_data is used. Eg:

[    9.073996] leds-gpio a0040000.leds_0: Led (null) renamed to red_led_1 due to name collision
Fixes bb4e9af0348d ("leds: core: Add support for composing LED class device names")
---
 drivers/leds/led-class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/led-class.c +1 -1
index 1fc40e8af75e..3363a6551a70 100644
@@ -376,7 +376,7 @@ int led_classdev_register_ext(struct device *parent,
 
 	if (ret)
 		dev_warn(parent, "Led %s renamed to %s due to name collision",
-				led_cdev->name, dev_name(led_cdev->dev));
+				proposed_name, dev_name(led_cdev->dev));
 
Quoted 5 lines

drivers/leds/led-class.c int led_classdev_register_ext(struct device *parent, · line 382

Quoted 3 lines
drivers/leds/led-class.c +0 -0
 	if (led_cdev->flags & LED_BRIGHT_HW_CHANGED) {
 		ret = led_add_brightness_hw_changed(led_cdev);

Thanks, applied.
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html