diff options
author | Michael Buesch <mb@bu3sch.de> | 2007-09-27 15:33:12 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:54:10 -0400 |
commit | 135900c182c321a4888ec496b014e6707272faca (patch) | |
tree | d17a3e12bf2e047c7a627f61e623e40dfbad87bf /net/rfkill/rfkill.c | |
parent | 937a049dd903bd810d858d0303cf86af9eb08b6f (diff) |
[RFKILL]: Add support for an rfkill LED.
This adds a LED trigger.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rfkill/rfkill.c')
-rw-r--r-- | net/rfkill/rfkill.c | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 637a9f0c7655..a8c5e0b914e4 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c | |||
@@ -37,6 +37,22 @@ static DEFINE_MUTEX(rfkill_mutex); | |||
37 | 37 | ||
38 | static enum rfkill_state rfkill_states[RFKILL_TYPE_MAX]; | 38 | static enum rfkill_state rfkill_states[RFKILL_TYPE_MAX]; |
39 | 39 | ||
40 | |||
41 | static void rfkill_led_trigger(struct rfkill *rfkill, | ||
42 | enum rfkill_state state) | ||
43 | { | ||
44 | #ifdef CONFIG_RFKILL_LEDS | ||
45 | struct led_trigger *led = &rfkill->led_trigger; | ||
46 | |||
47 | if (!led->name) | ||
48 | return; | ||
49 | if (state == RFKILL_STATE_OFF) | ||
50 | led_trigger_event(led, LED_OFF); | ||
51 | else | ||
52 | led_trigger_event(led, LED_FULL); | ||
53 | #endif /* CONFIG_RFKILL_LEDS */ | ||
54 | } | ||
55 | |||
40 | static int rfkill_toggle_radio(struct rfkill *rfkill, | 56 | static int rfkill_toggle_radio(struct rfkill *rfkill, |
41 | enum rfkill_state state) | 57 | enum rfkill_state state) |
42 | { | 58 | { |
@@ -48,8 +64,10 @@ static int rfkill_toggle_radio(struct rfkill *rfkill, | |||
48 | 64 | ||
49 | if (state != rfkill->state) { | 65 | if (state != rfkill->state) { |
50 | retval = rfkill->toggle_radio(rfkill->data, state); | 66 | retval = rfkill->toggle_radio(rfkill->data, state); |
51 | if (!retval) | 67 | if (!retval) { |
52 | rfkill->state = state; | 68 | rfkill->state = state; |
69 | rfkill_led_trigger(rfkill, state); | ||
70 | } | ||
53 | } | 71 | } |
54 | 72 | ||
55 | mutex_unlock(&rfkill->mutex); | 73 | mutex_unlock(&rfkill->mutex); |
@@ -328,6 +346,26 @@ void rfkill_free(struct rfkill *rfkill) | |||
328 | } | 346 | } |
329 | EXPORT_SYMBOL(rfkill_free); | 347 | EXPORT_SYMBOL(rfkill_free); |
330 | 348 | ||
349 | static void rfkill_led_trigger_register(struct rfkill *rfkill) | ||
350 | { | ||
351 | #ifdef CONFIG_RFKILL_LEDS | ||
352 | int error; | ||
353 | |||
354 | rfkill->led_trigger.name = rfkill->dev.bus_id; | ||
355 | error = led_trigger_register(&rfkill->led_trigger); | ||
356 | if (error) | ||
357 | rfkill->led_trigger.name = NULL; | ||
358 | #endif /* CONFIG_RFKILL_LEDS */ | ||
359 | } | ||
360 | |||
361 | static void rfkill_led_trigger_unregister(struct rfkill *rfkill) | ||
362 | { | ||
363 | #ifdef CONFIG_RFKILL_LEDS | ||
364 | if (rfkill->led_trigger.name) | ||
365 | led_trigger_unregister(&rfkill->led_trigger); | ||
366 | #endif | ||
367 | } | ||
368 | |||
331 | /** | 369 | /** |
332 | * rfkill_register - Register a rfkill structure. | 370 | * rfkill_register - Register a rfkill structure. |
333 | * @rfkill: rfkill structure to be registered | 371 | * @rfkill: rfkill structure to be registered |
@@ -357,6 +395,7 @@ int rfkill_register(struct rfkill *rfkill) | |||
357 | rfkill_remove_switch(rfkill); | 395 | rfkill_remove_switch(rfkill); |
358 | return error; | 396 | return error; |
359 | } | 397 | } |
398 | rfkill_led_trigger_register(rfkill); | ||
360 | 399 | ||
361 | return 0; | 400 | return 0; |
362 | } | 401 | } |
@@ -372,6 +411,7 @@ EXPORT_SYMBOL(rfkill_register); | |||
372 | */ | 411 | */ |
373 | void rfkill_unregister(struct rfkill *rfkill) | 412 | void rfkill_unregister(struct rfkill *rfkill) |
374 | { | 413 | { |
414 | rfkill_led_trigger_unregister(rfkill); | ||
375 | device_del(&rfkill->dev); | 415 | device_del(&rfkill->dev); |
376 | rfkill_remove_switch(rfkill); | 416 | rfkill_remove_switch(rfkill); |
377 | put_device(&rfkill->dev); | 417 | put_device(&rfkill->dev); |