| Message ID | 1230714558.24416.1.camel@odie.local |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Simon Holm Thøgersen <odie@cs.aau.dk> Date: Wed, 31 Dec 2008 10:09:18 +0100 > 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> Applied, thanks Simon. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 3c94f76..3eaa394 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)]; static bool rfkill_epo_lock_active; +#ifdef CONFIG_RFKILL_LEDS static void rfkill_led_trigger(struct rfkill *rfkill, enum rfkill_state state) { -#ifdef CONFIG_RFKILL_LEDS struct led_trigger *led = &rfkill->led_trigger; if (!led->name) @@ -66,10 +66,8 @@ static void rfkill_led_trigger(struct rfkill *rfkill, led_trigger_event(led, LED_OFF); else led_trigger_event(led, LED_FULL); -#endif /* CONFIG_RFKILL_LEDS */ } -#ifdef CONFIG_RFKILL_LEDS static void rfkill_led_trigger_activate(struct led_classdev *led) { struct rfkill *rfkill = container_of(led->trigger,
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> --- net/rfkill/rfkill.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)