diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2010-10-20 13:16:58 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:24:06 -0500 |
| commit | 2e48928d8a0f38c1b5c81eb3f1294de8a6382c68 (patch) | |
| tree | a752efac53a5bc036528d65625e990c0d4291ff7 | |
| parent | e081685c1bbe8da37c7f61726fdb783ff277f14f (diff) | |
rfkill: remove dead code
The following code is defined but never used.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | include/linux/rfkill.h | 31 | ||||
| -rw-r--r-- | net/rfkill/core.c | 14 |
2 files changed, 0 insertions, 45 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index 08c32e4f261a..c6c608482cba 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h | |||
| @@ -354,37 +354,6 @@ static inline bool rfkill_blocked(struct rfkill *rfkill) | |||
| 354 | } | 354 | } |
| 355 | #endif /* RFKILL || RFKILL_MODULE */ | 355 | #endif /* RFKILL || RFKILL_MODULE */ |
| 356 | 356 | ||
| 357 | |||
| 358 | #ifdef CONFIG_RFKILL_LEDS | ||
| 359 | /** | ||
| 360 | * rfkill_get_led_trigger_name - Get the LED trigger name for the button's LED. | ||
| 361 | * This function might return a NULL pointer if registering of the | ||
| 362 | * LED trigger failed. Use this as "default_trigger" for the LED. | ||
| 363 | */ | ||
| 364 | const char *rfkill_get_led_trigger_name(struct rfkill *rfkill); | ||
| 365 | |||
| 366 | /** | ||
| 367 | * rfkill_set_led_trigger_name -- set the LED trigger name | ||
| 368 | * @rfkill: rfkill struct | ||
| 369 | * @name: LED trigger name | ||
| 370 | * | ||
| 371 | * This function sets the LED trigger name of the radio LED | ||
| 372 | * trigger that rfkill creates. It is optional, but if called | ||
| 373 | * must be called before rfkill_register() to be effective. | ||
| 374 | */ | ||
| 375 | void rfkill_set_led_trigger_name(struct rfkill *rfkill, const char *name); | ||
| 376 | #else | ||
| 377 | static inline const char *rfkill_get_led_trigger_name(struct rfkill *rfkill) | ||
| 378 | { | ||
| 379 | return NULL; | ||
| 380 | } | ||
| 381 | |||
| 382 | static inline void | ||
| 383 | rfkill_set_led_trigger_name(struct rfkill *rfkill, const char *name) | ||
| 384 | { | ||
| 385 | } | ||
| 386 | #endif | ||
| 387 | |||
| 388 | #endif /* __KERNEL__ */ | 357 | #endif /* __KERNEL__ */ |
| 389 | 358 | ||
| 390 | #endif /* RFKILL_H */ | 359 | #endif /* RFKILL_H */ |
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 04f599089e6d..0198191b756d 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c | |||
| @@ -149,20 +149,6 @@ static void rfkill_led_trigger_activate(struct led_classdev *led) | |||
| 149 | rfkill_led_trigger_event(rfkill); | 149 | rfkill_led_trigger_event(rfkill); |
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | const char *rfkill_get_led_trigger_name(struct rfkill *rfkill) | ||
| 153 | { | ||
| 154 | return rfkill->led_trigger.name; | ||
| 155 | } | ||
| 156 | EXPORT_SYMBOL(rfkill_get_led_trigger_name); | ||
| 157 | |||
| 158 | void rfkill_set_led_trigger_name(struct rfkill *rfkill, const char *name) | ||
| 159 | { | ||
| 160 | BUG_ON(!rfkill); | ||
| 161 | |||
| 162 | rfkill->ledtrigname = name; | ||
| 163 | } | ||
| 164 | EXPORT_SYMBOL(rfkill_set_led_trigger_name); | ||
| 165 | |||
| 166 | static int rfkill_led_trigger_register(struct rfkill *rfkill) | 152 | static int rfkill_led_trigger_register(struct rfkill *rfkill) |
| 167 | { | 153 | { |
| 168 | rfkill->led_trigger.name = rfkill->ledtrigname | 154 | rfkill->led_trigger.name = rfkill->ledtrigname |
