b43: Rewrite suspend/resume code
This removes most of the b43 suspend/resume code (it's handled by mac80211) and moves the registration of devices to the attachment phase. This is required, because we must not register/unregister devices on suspend/resume. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
90c215c476
commit
a78b3bb2f3
@ -7,12 +7,13 @@ struct b43_wldev;
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/workqueue.h>
|
||||
|
||||
|
||||
#define B43_LED_MAX_NAME_LEN 31
|
||||
|
||||
struct b43_led {
|
||||
struct b43_wldev *dev;
|
||||
struct b43_wl *wl;
|
||||
/* The LED class device */
|
||||
struct led_classdev led_dev;
|
||||
/* The index number of the LED. */
|
||||
@ -22,8 +23,23 @@ struct b43_led {
|
||||
bool activelow;
|
||||
/* The unique name string for this LED device. */
|
||||
char name[B43_LED_MAX_NAME_LEN + 1];
|
||||
/* The current status of the LED. This is updated locklessly. */
|
||||
atomic_t state;
|
||||
/* The active state in hardware. */
|
||||
bool hw_state;
|
||||
};
|
||||
|
||||
struct b43_leds {
|
||||
struct b43_led led_tx;
|
||||
struct b43_led led_rx;
|
||||
struct b43_led led_radio;
|
||||
struct b43_led led_assoc;
|
||||
|
||||
struct work_struct work;
|
||||
};
|
||||
|
||||
#define B43_MAX_NR_LEDS 4
|
||||
|
||||
#define B43_LED_BEHAVIOUR 0x7F
|
||||
#define B43_LED_ACTIVELOW 0x80
|
||||
/* LED behaviour values */
|
||||
@ -42,6 +58,8 @@ enum b43_led_behaviour {
|
||||
B43_LED_INACTIVE,
|
||||
};
|
||||
|
||||
void b43_leds_register(struct b43_wldev *dev);
|
||||
void b43_leds_unregister(struct b43_wldev *dev);
|
||||
void b43_leds_init(struct b43_wldev *dev);
|
||||
void b43_leds_exit(struct b43_wldev *dev);
|
||||
|
||||
@ -49,10 +67,16 @@ void b43_leds_exit(struct b43_wldev *dev);
|
||||
#else /* CONFIG_B43_LEDS */
|
||||
/* LED support disabled */
|
||||
|
||||
struct b43_led {
|
||||
struct b43_leds {
|
||||
/* empty */
|
||||
};
|
||||
|
||||
static inline void b43_leds_register(struct b43_wldev *dev)
|
||||
{
|
||||
}
|
||||
static inline void b43_leds_unregister(struct b43_wldev *dev)
|
||||
{
|
||||
}
|
||||
static inline void b43_leds_init(struct b43_wldev *dev)
|
||||
{
|
||||
}
|
||||
|
Reference in New Issue
Block a user