Revert "leds: class: Store the color index in struct led_classdev"
PATCH 1/1 Revert "leds: class: Store the color index in struct led_classdev"
This reverts commit c7d80059b086c4986cd994a1973ec7a5d75f8eea.
The commit caused regressions to a few drivers (such as Logitech keyboard or System76 ACPI) that already had "color" leds sysfs entry; now they conflict with the commonly created sysfs of led class.
For addressing the regression, we revert the commit, so that the conflicting "color" sysfs entry is removed.
Note that the revert also removes the newly introduced led_classdev.color field, too. Since there is no user for that field yet, it should be OK to revert the whole. If this field is supposed to be used in future, only the necessary part can be re-applied later.
--- Documentation/ABI/testing/sysfs-class-led | 9 --------- drivers/leds/led-class.c | 21 --------------------- include/linux/leds.h | 1 - 3 files changed, 31 deletions(-)
Documentation/ABI/testing/sysfs-class-led +0 -9
@@ -59,15 +59,6 @@ Description: brightness. Reading this file when no hw brightness change event has happened will return an ENODATA error. -What: /sys/class/leds/<led>/color -Date: June 2023 -KernelVersion: 6.5 -Description: - Color of the LED. - - This is a read-only file. Reading this file returns the color - of the LED as a string (e.g: "red", "green", "multicolor"). - What: /sys/class/leds/<led>/trigger Date: March 2006 KernelVersion: 2.6.17
drivers/leds/led-class.c +0 -21
@@ -75,19 +75,6 @@ static ssize_t max_brightness_show(struct device *dev, }static DEVICE_ATTR_RO (max_brightness); -static ssize_t color_show (struct device *dev, -struct device_attribute *attr,char *buf) -{ -const char *color_text ="invalid" ; -struct led_classdev *led_cdev =dev_get_drvdata (dev); - -if (led_cdev->color <LED_COLOR_ID_MAX ) - color_text = led_colors[led_cdev->color]; - -return sysfs_emit (buf,"%s\n" , color_text); -} -static DEVICE_ATTR_RO (color); -#ifdef CONFIG_LEDS_TRIGGERS static BIN_ATTR(trigger, 0644, led_trigger_read, led_trigger_write, 0); static struct bin_attribute *led_trigger_bin_attrs[] = {
@@ -102,7 +89,6 @@ static const struct attribute_group led_trigger_group = {static struct attribute *led_class_attrs[] = { &dev_attr_brightness.attr, &dev_attr_max_brightness.attr, - &dev_attr_color.attr,NULL , };
@@ -505,10 +491,6 @@ int led_classdev_register_ext(struct device *parent,fwnode_property_read_u32 (init_data->fwnode,"max-brightness" , &led_cdev->max_brightness); - -if (fwnode_property_present (init_data->fwnode,"color" )) -fwnode_property_read_u32 (init_data->fwnode,"color" , - &led_cdev->color); } }else { proposed_name = led_cdev->name;
@@ -518,9 +500,6 @@ int led_classdev_register_ext(struct device *parent,if (ret <0 )return ret; -if (led_cdev->color >=LED_COLOR_ID_MAX ) -dev_warn (parent,"LED %s color identifier out of range\n" , final_name); -mutex_init (&led_cdev->led_access);mutex_lock (&led_cdev->led_access); led_cdev->dev = device_create_with_groups(&leds_class, parent, 0,
include/linux/leds.h +0 -1
@@ -100,7 +100,6 @@ struct led_classdev {const char *name;unsigned int brightness;unsigned int max_brightness; -unsigned int color;int flags;/* Lower 16 bits reflect status */
Signature · 1 line
2.35.3
Quoted 10 lines · Takashi Iwai
This reverts commit
c7d80059b086c4986cd994a1973ec7a5d75f8eea.The commit caused regressions to a few drivers (such as Logitech keyboard or System76 ACPI) that already had "color" leds sysfs entry; now they conflict with the commonly created sysfs of led class.
For addressing the regression, we revert the commit, so that the conflicting "color" sysfs entry is removed.
[...]
Applied, thanks!
[1/1] Revert "leds: class: Store the color index in struct led_classdev"
commit: 17e1ad377bb1d39260e0594ee284d8e03f64fdfb
--
Lee Jones [李琼斯]
Quoted 11 lines · Lee Jones
Quoted 9 lines · Takashi Iwai
This reverts commit
c7d80059b086c4986cd994a1973ec7a5d75f8eea.The commit caused regressions to a few drivers (such as Logitech keyboard or System76 ACPI) that already had "color" leds sysfs entry; now they conflict with the commonly created sysfs of led class.
For addressing the regression, we revert the commit, so that the conflicting "color" sysfs entry is removed.
Quoted 6 lines
Quoted 1 line
[...]
Applied, thanks!
[1/1] Revert "leds: class: Store the color index in struct
led_classdev"commit: 17e1ad377bb1d39260e0594ee284d8e03f64fdfb
It turned out that drivers/leds/rgb/leds-group-multicolor.c initializes the cdev->color, and this revert breaks it.
So please scratch my previous revert patch.
I'm going to submit a partial revert instead.
thanks,
Takashi
Lee Jones
maintainerQuoted 15 lines · Takashi Iwai
Quoted 13 lines · Lee Jones
Quoted 10 lines · Takashi Iwai
This reverts commit
c7d80059b086c4986cd994a1973ec7a5d75f8eea.The commit caused regressions to a few drivers (such as Logitech keyboard or System76 ACPI) that already had "color" leds sysfs entry; now they conflict with the commonly created sysfs of led class.
For addressing the regression, we revert the commit, so that the conflicting "color" sysfs entry is removed.
[...]
Quoted 7 lines
Quoted 4 lines
Applied, thanks!
[1/1] Revert "leds: class: Store the color index in struct
led_classdev"commit: 17e1ad377bb1d39260e0594ee284d8e03f64fdfbIt turned out that
drivers/leds/rgb/leds-group-multicolor.cinitializes thecdev->color, and this revert breaks it.
Indeed:
linux/leds-fixes/drivers/leds/rgb/leds-group-multicolor.c: In function ‘leds_gmc_probe’:linux/leds-fixes/drivers/leds/rgb/leds-group-multicolor.c:109:49: error: ‘struct led_classdev’ has no member named ‘color’ linux/leds-fixes/drivers/leds/rgb/leds-group-multicolor.c:120:13: error: ‘struct led_classdev’ has no member named ‘color’
Quoted 2 lines
So please scratch my previous revert patch.
I'm going to submit a partial revert instead.
Sure.
Signature · 1 line
Lee Jones [李琼斯]