diff options
author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2010-12-15 10:30:49 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-16 15:22:30 -0500 |
commit | 895ad7eb21ed228444169dbbff44f3dccfc7e006 (patch) | |
tree | 1f410c78bd463c9d5963d058493cecde7230f56d /drivers/net/wireless/ath | |
parent | d8a8440e3f1f0cdd23074c6d2d8cbbde204a4374 (diff) |
ath9k_hw: Move get_streams() to hw.h
This helper can be used in multiple places. Also make
it inline returning u8.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c index 69f779237d28..4c744793b4b6 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c | |||
@@ -50,11 +50,6 @@ static int ar9003_get_training_power_2g(struct ath_hw *ah) | |||
50 | return power; | 50 | return power; |
51 | } | 51 | } |
52 | 52 | ||
53 | static int get_streams(int mask) | ||
54 | { | ||
55 | return !!(mask & BIT(0)) + !!(mask & BIT(1)) + !!(mask & BIT(2)); | ||
56 | } | ||
57 | |||
58 | static int ar9003_get_training_power_5g(struct ath_hw *ah) | 53 | static int ar9003_get_training_power_5g(struct ath_hw *ah) |
59 | { | 54 | { |
60 | struct ath_common *common = ath9k_hw_common(ah); | 55 | struct ath_common *common = ath9k_hw_common(ah); |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 97f22c428603..fb64ab841dc1 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -868,6 +868,11 @@ static inline struct ath_hw_ops *ath9k_hw_ops(struct ath_hw *ah) | |||
868 | return &ah->ops; | 868 | return &ah->ops; |
869 | } | 869 | } |
870 | 870 | ||
871 | static inline u8 get_streams(int mask) | ||
872 | { | ||
873 | return !!(mask & BIT(0)) + !!(mask & BIT(1)) + !!(mask & BIT(2)); | ||
874 | } | ||
875 | |||
871 | /* Initialization, Detach, Reset */ | 876 | /* Initialization, Detach, Reset */ |
872 | const char *ath9k_hw_probe(u16 vendorid, u16 devid); | 877 | const char *ath9k_hw_probe(u16 vendorid, u16 devid); |
873 | void ath9k_hw_deinit(struct ath_hw *ah); | 878 | void ath9k_hw_deinit(struct ath_hw *ah); |