Skip to content

Commit 06d99fc

Browse files
cmcqueenlag-linaro
authored andcommitted
leds: led-triggers: Improvements for default trigger
Accept "default" written to sysfs trigger attr. If the text "default" is written to the LED's sysfs 'trigger' attr, then call led_trigger_set_default() to set the LED to its default trigger. If the default trigger is set to "none", then led_trigger_set_default() will remove a trigger. This is in contrast to the default trigger being unset, in which case led_trigger_set_default() does nothing. Signed-off-by: Craig McQueen <[email protected]> Reviewed-by: Jacek Anaszewski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 08ca89e commit 06d99fc

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

Documentation/ABI/testing/sysfs-class-led

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ Description:
7272
/sys/class/leds/<led> once a given trigger is selected. For
7373
their documentation see `sysfs-class-led-trigger-*`.
7474

75+
Writing "none" removes the trigger for this LED.
76+
77+
Writing "default" sets the trigger to the LED's default trigger
78+
(which would often be configured in the device tree for the
79+
hardware).
80+
7581
What: /sys/class/leds/<led>/inverted
7682
Date: January 2011
7783
KernelVersion: 2.6.38

drivers/leds/led-triggers.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ ssize_t led_trigger_write(struct file *filp, struct kobject *kobj,
5454
goto unlock;
5555
}
5656

57+
if (sysfs_streq(buf, "default")) {
58+
led_trigger_set_default(led_cdev);
59+
goto unlock;
60+
}
61+
5762
down_read(&triggers_list_lock);
5863
list_for_each_entry(trig, &trigger_list, next_trig) {
5964
if (sysfs_streq(buf, trig->name) && trigger_relevant(led_cdev, trig)) {
@@ -98,6 +103,9 @@ static int led_trigger_format(char *buf, size_t size,
98103
int len = led_trigger_snprintf(buf, size, "%s",
99104
led_cdev->trigger ? "none" : "[none]");
100105

106+
if (led_cdev->default_trigger)
107+
len += led_trigger_snprintf(buf + len, size - len, " default");
108+
101109
list_for_each_entry(trig, &trigger_list, next_trig) {
102110
bool hit;
103111

@@ -281,6 +289,11 @@ void led_trigger_set_default(struct led_classdev *led_cdev)
281289
if (!led_cdev->default_trigger)
282290
return;
283291

292+
if (!strcmp(led_cdev->default_trigger, "none")) {
293+
led_trigger_remove(led_cdev);
294+
return;
295+
}
296+
284297
down_read(&triggers_list_lock);
285298
down_write(&led_cdev->trigger_lock);
286299
list_for_each_entry(trig, &trigger_list, next_trig) {

0 commit comments

Comments
 (0)