Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

leds: support automatic start of blinking with ledtrig-timer

By setting initial values blink_delay_on and blink_delay_off in a
led_classdev struct, this change starts the blinking when the led is
initialized.

With this patch, you can initialize blink_delay_on and blink_delay_off in
led_classdev with default_trigger set to "timer", and the led will start
up blinking. The current ledtrig-timer implementation ignores any initial
blink_delay_on/blink_delay_off settings, and requires setting
blink_delay_on/blink_delay_off (typically from userspace) before the led
blinks.

Signed-off-by: Esben Haabendal <eha@doredevelopment.dk>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Esben Haabendal and committed by
Linus Torvalds
fff26f81 5ff77428

+12 -1
+2 -1
drivers/leds/led-class.c
··· 131 131 if (!led_cdev->blink_brightness) 132 132 led_cdev->blink_brightness = led_cdev->max_brightness; 133 133 134 - if (delay_on == led_cdev->blink_delay_on && 134 + if (led_get_trigger_data(led_cdev) && 135 + delay_on == led_cdev->blink_delay_on && 135 136 delay_off == led_cdev->blink_delay_off) 136 137 return; 137 138
+7
drivers/leds/leds.h
··· 40 40 void led_trigger_set(struct led_classdev *led_cdev, 41 41 struct led_trigger *trigger); 42 42 void led_trigger_remove(struct led_classdev *led_cdev); 43 + 44 + static inline void *led_get_trigger_data(struct led_classdev *led_cdev) 45 + { 46 + return led_cdev->trigger_data; 47 + } 48 + 43 49 #else 44 50 #define led_trigger_set_default(x) do {} while (0) 45 51 #define led_trigger_set(x, y) do {} while (0) 46 52 #define led_trigger_remove(x) do {} while (0) 53 + #define led_get_trigger_data(x) (NULL) 47 54 #endif 48 55 49 56 ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
+3
drivers/leds/ledtrig-timer.c
··· 91 91 if (rc) 92 92 goto err_out_delayon; 93 93 94 + led_blink_set(led_cdev, &led_cdev->blink_delay_on, 95 + &led_cdev->blink_delay_off); 96 + 94 97 led_cdev->trigger_data = (void *)1; 95 98 96 99 return;