net/rfkill/rfkill.c: fix unused rfkill_led_trigger() warning
Simon Holm Th√łgersen [Mon, 5 Jan 2009 01:11:24 +0000 (17:11 -0800)]
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>

net/rfkill/rfkill.c

index 3c94f76..3eaa394 100644 (file)
@@ -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,