Commit 16864755 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'leds-fixes-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds

Pull LED fix from Lee Jones:

 - Remove duplicate sysfs entry 'color' from LEDs class

* tag 'leds-fixes-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds:
  leds: class: Don't expose color sysfs entry
parents 9d3eac3c 8f2244c9
...@@ -59,15 +59,6 @@ Description: ...@@ -59,15 +59,6 @@ Description:
brightness. Reading this file when no hw brightness change brightness. Reading this file when no hw brightness change
event has happened will return an ENODATA error. 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 What: /sys/class/leds/<led>/trigger
Date: March 2006 Date: March 2006
KernelVersion: 2.6.17 KernelVersion: 2.6.17
......
...@@ -75,19 +75,6 @@ static ssize_t max_brightness_show(struct device *dev, ...@@ -75,19 +75,6 @@ static ssize_t max_brightness_show(struct device *dev,
} }
static DEVICE_ATTR_RO(max_brightness); 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 #ifdef CONFIG_LEDS_TRIGGERS
static BIN_ATTR(trigger, 0644, led_trigger_read, led_trigger_write, 0); static BIN_ATTR(trigger, 0644, led_trigger_read, led_trigger_write, 0);
static struct bin_attribute *led_trigger_bin_attrs[] = { static struct bin_attribute *led_trigger_bin_attrs[] = {
...@@ -102,7 +89,6 @@ static const struct attribute_group led_trigger_group = { ...@@ -102,7 +89,6 @@ static const struct attribute_group led_trigger_group = {
static struct attribute *led_class_attrs[] = { static struct attribute *led_class_attrs[] = {
&dev_attr_brightness.attr, &dev_attr_brightness.attr,
&dev_attr_max_brightness.attr, &dev_attr_max_brightness.attr,
&dev_attr_color.attr,
NULL, NULL,
}; };
......
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