diff options
author | Simon Holm Thøgersen <odie@cs.aau.dk> | 2009-01-04 20:11:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-04 20:11:24 -0500 |
commit | f32f8b72e02e851972a0172603104046aa5fec96 (patch) | |
tree | 10b286e280816a9202bde24938f69c11abd45347 /net/rfkill | |
parent | 939678f81a55c839ae58c9cc3d4ec6d0f60e7dc7 (diff) |
net/rfkill/rfkill.c: fix unused rfkill_led_trigger() warning
commit 4dec9b807be757780ca3611a959ac22c28d292a7 ("rfkill: strip pointless
notifier chain") removed the only user of rfkill_led_trigger() that was not
guarded by #ifdef CONFIG_RFKILL_LEDS. Therefore, move rfkill_led_trigger()
completely inside #ifdef CONFIG_RFKILL_LEDS and avoid the compile time
warning:
net/rfkill/rfkill.c:59: warning: 'rfkill_led_trigger' defined but not used
Signed-off-by: Simon Holm Thøgersen <odie@cs.aau.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rfkill')
-rw-r--r-- | net/rfkill/rfkill.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 3c94f76d5525..3eaa39403c13 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c | |||
@@ -54,10 +54,10 @@ static unsigned long rfkill_states_lockdflt[BITS_TO_LONGS(RFKILL_TYPE_MAX)]; | |||
54 | static bool rfkill_epo_lock_active; | 54 | static bool rfkill_epo_lock_active; |
55 | 55 | ||
56 | 56 | ||
57 | #ifdef CONFIG_RFKILL_LEDS | ||
57 | static void rfkill_led_trigger(struct rfkill *rfkill, | 58 | static void rfkill_led_trigger(struct rfkill *rfkill, |
58 | enum rfkill_state state) | 59 | enum rfkill_state state) |
59 | { | 60 | { |
60 | #ifdef CONFIG_RFKILL_LEDS | ||
61 | struct led_trigger *led = &rfkill->led_trigger; | 61 | struct led_trigger *led = &rfkill->led_trigger; |
62 | 62 | ||
63 | if (!led->name) | 63 | if (!led->name) |
@@ -66,10 +66,8 @@ static void rfkill_led_trigger(struct rfkill *rfkill, | |||
66 | led_trigger_event(led, LED_OFF); | 66 | led_trigger_event(led, LED_OFF); |
67 | else | 67 | else |
68 | led_trigger_event(led, LED_FULL); | 68 | led_trigger_event(led, LED_FULL); |
69 | #endif /* CONFIG_RFKILL_LEDS */ | ||
70 | } | 69 | } |
71 | 70 | ||
72 | #ifdef CONFIG_RFKILL_LEDS | ||
73 | static void rfkill_led_trigger_activate(struct led_classdev *led) | 71 | static void rfkill_led_trigger_activate(struct led_classdev *led) |
74 | { | 72 | { |
75 | struct rfkill *rfkill = container_of(led->trigger, | 73 | struct rfkill *rfkill = container_of(led->trigger, |