diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 15:52:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 15:52:42 -0500 |
commit | e81d372ff9f694e13fa46e8b5aaed505c7fd2a1f (patch) | |
tree | 058d5004b6ca7602aaec6ef2d992be9c71a8e81c /include/linux/leds.h | |
parent | 75e300c8ba5864367634d946c729d8fd05c1cbc2 (diff) | |
parent | 2f05e1d4458f9cb68d4d36fb47e6830fec03c80e (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
Pull LED subsystem update from Bryan Wu.
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (47 commits)
leds: leds-lp5521: return an error code on error in probe()
leds: leds-clevo-mail: Use pr_* instead of printks
leds: leds-rb532: Fix checkpatch errors
leds: led-triggers: Fix checkpatch warnings
leds: ledtrig-backlight: Fix checkpatch error
leds: leds-wrap: Use <linux/io.h> instead of <asm/io.h>
leds: leds-wm8350: Use dev_err instead of printk
leds: leds-pwm: Fix checkpatch warning
leds: leds-pca955x: Use dev_info instead of printk
leds: leds-net48xx: Use linux/io.h instead of asm/io.h
leds: leds-lt3593: Fix checkpatch warnings
leds: leds-gpio: Use dev_info instead of printk
leds: leds-da903x: Fix checkpatch error and warnings
leds: leds-bd2802: Fix checkpatch warnings
leds: leds-adp5520: Fix checkpatch warnings
leds: led-class: Fix checkpatch warning
leds: leds-ns2: use devm_gpio_request_one
leds: leds-lt3593: use devm_gpio_request_one
leds: leds-gpio: use devm_gpio_request_one
leds: lp3944: Fix return value
...
Diffstat (limited to 'include/linux/leds.h')
-rw-r--r-- | include/linux/leds.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/leds.h b/include/linux/leds.h index 6e53bb31c220..0d9b5eed714e 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h | |||
@@ -179,6 +179,23 @@ extern void led_trigger_blink_oneshot(struct led_trigger *trigger, | |||
179 | unsigned long *delay_on, | 179 | unsigned long *delay_on, |
180 | unsigned long *delay_off, | 180 | unsigned long *delay_off, |
181 | int invert); | 181 | int invert); |
182 | /** | ||
183 | * led_trigger_rename_static - rename a trigger | ||
184 | * @name: the new trigger name | ||
185 | * @trig: the LED trigger to rename | ||
186 | * | ||
187 | * Change a LED trigger name by copying the string passed in | ||
188 | * name into current trigger name, which MUST be large | ||
189 | * enough for the new string. | ||
190 | * | ||
191 | * Note that name must NOT point to the same string used | ||
192 | * during LED registration, as that could lead to races. | ||
193 | * | ||
194 | * This is meant to be used on triggers with statically | ||
195 | * allocated name. | ||
196 | */ | ||
197 | extern void led_trigger_rename_static(const char *name, | ||
198 | struct led_trigger *trig); | ||
182 | 199 | ||
183 | #else | 200 | #else |
184 | 201 | ||