aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Baltieri <fabio.baltieri@gmail.com>2012-11-04 04:54:34 -0500
committerBryan Wu <cooloney@gmail.com>2012-11-26 17:28:50 -0500
commita8df7b1ab70bfd6f261fa5e96985fca638299acc (patch)
tree92e50e11054d9182757899e9c16070dbffadc83b
parent5cce0105c8d07d3bd5f578c77d273e1a1e09f157 (diff)
leds: add led_trigger_rename function
Implements a "led_trigger_rename" function to rename a trigger with proper locking. This assumes that led name was originally allocated in non-constant storage. Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com> Cc: Kurt Van Dijck <kurt.van.dijck@eia.be> Signed-off-by: Bryan Wu <cooloney@gmail.com>
-rw-r--r--drivers/leds/led-triggers.c13
-rw-r--r--include/linux/leds.h18
2 files changed, 31 insertions, 0 deletions
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 262eb4193710..a4fa4bf02d53 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -166,6 +166,19 @@ void led_trigger_set_default(struct led_classdev *led_cdev)
166} 166}
167EXPORT_SYMBOL_GPL(led_trigger_set_default); 167EXPORT_SYMBOL_GPL(led_trigger_set_default);
168 168
169void led_trigger_rename_static(const char *name, struct led_trigger *trig)
170{
171 /* new name must be on a temporary string to prevent races */
172 BUG_ON(name == trig->name);
173
174 down_write(&triggers_list_lock);
175 /* this assumes that trig->name was originaly allocated to
176 * non constant storage */
177 strcpy((char *)trig->name, name);
178 up_write(&triggers_list_lock);
179}
180EXPORT_SYMBOL_GPL(led_trigger_rename_static);
181
169/* LED Trigger Interface */ 182/* LED Trigger Interface */
170 183
171int led_trigger_register(struct led_trigger *trig) 184int led_trigger_register(struct led_trigger *trig)
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 6e53bb31c220..8107592cfc41 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -139,6 +139,24 @@ extern void led_blink_set_oneshot(struct led_classdev *led_cdev,
139extern void led_set_brightness(struct led_classdev *led_cdev, 139extern void led_set_brightness(struct led_classdev *led_cdev,
140 enum led_brightness brightness); 140 enum led_brightness brightness);
141 141
142/**
143 * led_trigger_rename_static - rename a trigger
144 * @name: the new trigger name
145 * @trig: the LED trigger to rename
146 *
147 * Change a LED trigger name by copying the string passed in
148 * name into current trigger name, which MUST be large
149 * enough for the new string.
150 *
151 * Note that name must NOT point to the same string used
152 * during LED registration, as that could lead to races.
153 *
154 * This is meant to be used on triggers with statically
155 * allocated name.
156 */
157extern void led_trigger_rename_static(const char *name,
158 struct led_trigger *trig);
159
142/* 160/*
143 * LED Triggers 161 * LED Triggers
144 */ 162 */