diff options
Diffstat (limited to 'drivers/net/wireless/b43legacy/rfkill.h')
| -rw-r--r-- | drivers/net/wireless/b43legacy/rfkill.h | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/drivers/net/wireless/b43legacy/rfkill.h b/drivers/net/wireless/b43legacy/rfkill.h index 388ee0b855a..4a81ba3f54f 100644 --- a/drivers/net/wireless/b43legacy/rfkill.h +++ b/drivers/net/wireless/b43legacy/rfkill.h @@ -7,21 +7,27 @@ struct b43legacy_wldev; #include <linux/rfkill.h> #include <linux/workqueue.h> +#include <linux/input-polldev.h> + struct b43legacy_rfkill { /* The RFKILL subsystem data structure */ struct rfkill *rfkill; + /* The poll device for the RFKILL input button */ + struct input_polled_dev *poll_dev; /* The unique name of this rfkill switch */ char name[32]; - /* Workqueue for asynchronous notification. */ - struct work_struct notify_work; }; +/* All the init functions return void, because we are not interested + * in failing the b43 init process when rfkill init failed. */ +void b43legacy_rfkill_alloc(struct b43legacy_wldev *dev); +void b43legacy_rfkill_free(struct b43legacy_wldev *dev); void b43legacy_rfkill_init(struct b43legacy_wldev *dev); void b43legacy_rfkill_exit(struct b43legacy_wldev *dev); -void b43legacy_rfkill_toggled(struct b43legacy_wldev *dev, bool on); -char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev); + +char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev); #else /* CONFIG_B43LEGACY_RFKILL */ @@ -31,17 +37,19 @@ struct b43legacy_rfkill { /* empty */ }; -static inline void b43legacy_rfkill_init(struct b43legacy_wldev *dev) +static inline void b43legacy_rfkill_alloc(struct b43legacy_wldev *dev) { } -static inline void b43legacy_rfkill_exit(struct b43legacy_wldev *dev) +static inline void b43legacy_rfkill_free(struct b43legacy_wldev *dev) { } -static inline void b43legacy_rfkill_toggled(struct b43legacy_wldev *dev, - bool on) +static inline void b43legacy_rfkill_init(struct b43legacy_wldev *dev) +{ +} +static inline void b43legacy_rfkill_exit(struct b43legacy_wldev *dev) { } -static inline char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev) +static inline char * b43legacy_rfkill_led_name(struct b43legacy_wldev *dev) { return NULL; } |