diff options
author | Jingoo Han <jg1.han@samsung.com> | 2012-11-19 00:35:55 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@gmail.com> | 2012-11-26 17:28:51 -0500 |
commit | 057407c732b7761cf417a1e6633a02d9d473340d (patch) | |
tree | 60b3e4d38b7e9b16eeafd776148bac8fd82aca65 | |
parent | a8df7b1ab70bfd6f261fa5e96985fca638299acc (diff) |
led: Add dependency on CONFIG_LEDS_TRIGGERS to led_trigger_rename_static()
This patch fixes build warnings when CONFIG_LEDS_TRIGGERS is
disabled as below:
include/linux/leds.h:158:18: warning: 'struct led_trigger' declared inside parameter list [enabled by default]
include/linux/leds.h:158:18: warning: its scope is only this definition or declaration, which is probably not what you want [enabled
by default]
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Fabio Baltieri <fabio.baltieri@gmail.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
-rw-r--r-- | include/linux/leds.h | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/include/linux/leds.h b/include/linux/leds.h index 8107592cfc41..0d9b5eed714e 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h | |||
@@ -139,24 +139,6 @@ extern void led_blink_set_oneshot(struct led_classdev *led_cdev, | |||
139 | extern void led_set_brightness(struct led_classdev *led_cdev, | 139 | extern 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 | */ | ||
157 | extern void led_trigger_rename_static(const char *name, | ||
158 | struct led_trigger *trig); | ||
159 | |||
160 | /* | 142 | /* |
161 | * LED Triggers | 143 | * LED Triggers |
162 | */ | 144 | */ |
@@ -197,6 +179,23 @@ extern void led_trigger_blink_oneshot(struct led_trigger *trigger, | |||
197 | unsigned long *delay_on, | 179 | unsigned long *delay_on, |
198 | unsigned long *delay_off, | 180 | unsigned long *delay_off, |
199 | 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); | ||
200 | 199 | ||
201 | #else | 200 | #else |
202 | 201 | ||