diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-08-07 00:15:09 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:12:48 -0400 |
commit | 54e4cec69e70ba30aec68650fb95b3a7e1e6dc18 (patch) | |
tree | 78159e30f1b5cb00bc71fd2b78e398bb0b4df23e | |
parent | 87b5bee86d281383ac2e5cae20ec47afa8fa374a (diff) |
ath9k: Cleanup function return types
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.c | 17 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.h | 8 |
5 files changed, 11 insertions, 25 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c index 4cb64a0900bb..86b13d1b290d 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom.c +++ b/drivers/net/wireless/ath/ath9k/eeprom.c | |||
@@ -35,7 +35,6 @@ static void ath9k_hw_analog_shift_rmw(struct ath_hw *ah, | |||
35 | 35 | ||
36 | static inline u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz) | 36 | static inline u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz) |
37 | { | 37 | { |
38 | |||
39 | if (fbin == AR5416_BCHAN_UNUSED) | 38 | if (fbin == AR5416_BCHAN_UNUSED) |
40 | return fbin; | 39 | return fbin; |
41 | 40 | ||
@@ -95,7 +94,7 @@ static inline bool ath9k_hw_nvram_read(struct ath_hw *ah, u32 off, u16 *data) | |||
95 | return sc->bus_ops->eeprom_read(ah, off, data); | 94 | return sc->bus_ops->eeprom_read(ah, off, data); |
96 | } | 95 | } |
97 | 96 | ||
98 | static inline bool ath9k_hw_fill_vpd_table(u8 pwrMin, u8 pwrMax, u8 *pPwrList, | 97 | static inline void ath9k_hw_fill_vpd_table(u8 pwrMin, u8 pwrMax, u8 *pPwrList, |
99 | u8 *pVpdList, u16 numIntercepts, | 98 | u8 *pVpdList, u16 numIntercepts, |
100 | u8 *pRetVpdList) | 99 | u8 *pRetVpdList) |
101 | { | 100 | { |
@@ -120,8 +119,6 @@ static inline bool ath9k_hw_fill_vpd_table(u8 pwrMin, u8 pwrMax, u8 *pPwrList, | |||
120 | pRetVpdList[i] = (u8) k; | 119 | pRetVpdList[i] = (u8) k; |
121 | currPwr += 2; | 120 | currPwr += 2; |
122 | } | 121 | } |
123 | |||
124 | return true; | ||
125 | } | 122 | } |
126 | 123 | ||
127 | static void ath9k_hw_get_legacy_target_powers(struct ath_hw *ah, | 124 | static void ath9k_hw_get_legacy_target_powers(struct ath_hw *ah, |
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 71a3bcc450a2..6514dc7a7be7 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -4019,14 +4019,12 @@ void ath9k_hw_reset_tsf(struct ath_hw *ah) | |||
4019 | ath9k_ps_restore(ah->ah_sc); | 4019 | ath9k_ps_restore(ah->ah_sc); |
4020 | } | 4020 | } |
4021 | 4021 | ||
4022 | bool ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting) | 4022 | void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting) |
4023 | { | 4023 | { |
4024 | if (setting) | 4024 | if (setting) |
4025 | ah->misc_mode |= AR_PCU_TX_ADD_TSF; | 4025 | ah->misc_mode |= AR_PCU_TX_ADD_TSF; |
4026 | else | 4026 | else |
4027 | ah->misc_mode &= ~AR_PCU_TX_ADD_TSF; | 4027 | ah->misc_mode &= ~AR_PCU_TX_ADD_TSF; |
4028 | |||
4029 | return true; | ||
4030 | } | 4028 | } |
4031 | 4029 | ||
4032 | bool ath9k_hw_setslottime(struct ath_hw *ah, u32 us) | 4030 | bool ath9k_hw_setslottime(struct ath_hw *ah, u32 us) |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index d4aaf4f8db29..e83e900e2750 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -601,7 +601,7 @@ void ath9k_hw_write_associd(struct ath_softc *sc); | |||
601 | u64 ath9k_hw_gettsf64(struct ath_hw *ah); | 601 | u64 ath9k_hw_gettsf64(struct ath_hw *ah); |
602 | void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64); | 602 | void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64); |
603 | void ath9k_hw_reset_tsf(struct ath_hw *ah); | 603 | void ath9k_hw_reset_tsf(struct ath_hw *ah); |
604 | bool ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting); | 604 | void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting); |
605 | bool ath9k_hw_setslottime(struct ath_hw *ah, u32 us); | 605 | bool ath9k_hw_setslottime(struct ath_hw *ah, u32 us); |
606 | void ath9k_hw_set11nmac2040(struct ath_hw *ah, enum ath9k_ht_macmode mode); | 606 | void ath9k_hw_set11nmac2040(struct ath_hw *ah, enum ath9k_ht_macmode mode); |
607 | void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period); | 607 | void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period); |
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c index 6f923e318727..800bfab94635 100644 --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c | |||
@@ -40,20 +40,15 @@ u32 ath9k_hw_gettxbuf(struct ath_hw *ah, u32 q) | |||
40 | return REG_READ(ah, AR_QTXDP(q)); | 40 | return REG_READ(ah, AR_QTXDP(q)); |
41 | } | 41 | } |
42 | 42 | ||
43 | bool ath9k_hw_puttxbuf(struct ath_hw *ah, u32 q, u32 txdp) | 43 | void ath9k_hw_puttxbuf(struct ath_hw *ah, u32 q, u32 txdp) |
44 | { | 44 | { |
45 | REG_WRITE(ah, AR_QTXDP(q), txdp); | 45 | REG_WRITE(ah, AR_QTXDP(q), txdp); |
46 | |||
47 | return true; | ||
48 | } | 46 | } |
49 | 47 | ||
50 | bool ath9k_hw_txstart(struct ath_hw *ah, u32 q) | 48 | void ath9k_hw_txstart(struct ath_hw *ah, u32 q) |
51 | { | 49 | { |
52 | DPRINTF(ah->ah_sc, ATH_DBG_QUEUE, "Enable TXE on queue: %u\n", q); | 50 | DPRINTF(ah->ah_sc, ATH_DBG_QUEUE, "Enable TXE on queue: %u\n", q); |
53 | |||
54 | REG_WRITE(ah, AR_Q_TXE, 1 << q); | 51 | REG_WRITE(ah, AR_Q_TXE, 1 << q); |
55 | |||
56 | return true; | ||
57 | } | 52 | } |
58 | 53 | ||
59 | u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q) | 54 | u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q) |
@@ -178,7 +173,7 @@ bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q) | |||
178 | #undef ATH9K_TIME_QUANTUM | 173 | #undef ATH9K_TIME_QUANTUM |
179 | } | 174 | } |
180 | 175 | ||
181 | bool ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds, | 176 | void ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds, |
182 | u32 segLen, bool firstSeg, | 177 | u32 segLen, bool firstSeg, |
183 | bool lastSeg, const struct ath_desc *ds0) | 178 | bool lastSeg, const struct ath_desc *ds0) |
184 | { | 179 | { |
@@ -202,8 +197,6 @@ bool ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds, | |||
202 | ads->ds_txstatus4 = ads->ds_txstatus5 = 0; | 197 | ads->ds_txstatus4 = ads->ds_txstatus5 = 0; |
203 | ads->ds_txstatus6 = ads->ds_txstatus7 = 0; | 198 | ads->ds_txstatus6 = ads->ds_txstatus7 = 0; |
204 | ads->ds_txstatus8 = ads->ds_txstatus9 = 0; | 199 | ads->ds_txstatus8 = ads->ds_txstatus9 = 0; |
205 | |||
206 | return true; | ||
207 | } | 200 | } |
208 | 201 | ||
209 | void ath9k_hw_cleartxdesc(struct ath_hw *ah, struct ath_desc *ds) | 202 | void ath9k_hw_cleartxdesc(struct ath_hw *ah, struct ath_desc *ds) |
@@ -888,7 +881,7 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, | |||
888 | return 0; | 881 | return 0; |
889 | } | 882 | } |
890 | 883 | ||
891 | bool ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds, | 884 | void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds, |
892 | u32 size, u32 flags) | 885 | u32 size, u32 flags) |
893 | { | 886 | { |
894 | struct ar5416_desc *ads = AR5416DESC(ds); | 887 | struct ar5416_desc *ads = AR5416DESC(ds); |
@@ -901,8 +894,6 @@ bool ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds, | |||
901 | ads->ds_rxstatus8 &= ~AR_RxDone; | 894 | ads->ds_rxstatus8 &= ~AR_RxDone; |
902 | if (!(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) | 895 | if (!(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) |
903 | memset(&(ads->u), 0, sizeof(ads->u)); | 896 | memset(&(ads->u), 0, sizeof(ads->u)); |
904 | |||
905 | return true; | ||
906 | } | 897 | } |
907 | 898 | ||
908 | bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set) | 899 | bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set) |
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h index 1176bce8b76c..7b3982295a43 100644 --- a/drivers/net/wireless/ath/ath9k/mac.h +++ b/drivers/net/wireless/ath/ath9k/mac.h | |||
@@ -628,12 +628,12 @@ struct ath9k_channel; | |||
628 | struct ath_rate_table; | 628 | struct ath_rate_table; |
629 | 629 | ||
630 | u32 ath9k_hw_gettxbuf(struct ath_hw *ah, u32 q); | 630 | u32 ath9k_hw_gettxbuf(struct ath_hw *ah, u32 q); |
631 | bool ath9k_hw_puttxbuf(struct ath_hw *ah, u32 q, u32 txdp); | 631 | void ath9k_hw_puttxbuf(struct ath_hw *ah, u32 q, u32 txdp); |
632 | bool ath9k_hw_txstart(struct ath_hw *ah, u32 q); | 632 | void ath9k_hw_txstart(struct ath_hw *ah, u32 q); |
633 | u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); | 633 | u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); |
634 | bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); | 634 | bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); |
635 | bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q); | 635 | bool ath9k_hw_stoptxdma(struct ath_hw *ah, u32 q); |
636 | bool ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds, | 636 | void ath9k_hw_filltxdesc(struct ath_hw *ah, struct ath_desc *ds, |
637 | u32 segLen, bool firstSeg, | 637 | u32 segLen, bool firstSeg, |
638 | bool lastSeg, const struct ath_desc *ds0); | 638 | bool lastSeg, const struct ath_desc *ds0); |
639 | void ath9k_hw_cleartxdesc(struct ath_hw *ah, struct ath_desc *ds); | 639 | void ath9k_hw_cleartxdesc(struct ath_hw *ah, struct ath_desc *ds); |
@@ -668,7 +668,7 @@ bool ath9k_hw_releasetxqueue(struct ath_hw *ah, u32 q); | |||
668 | bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q); | 668 | bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q); |
669 | int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, | 669 | int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, |
670 | u32 pa, struct ath_desc *nds, u64 tsf); | 670 | u32 pa, struct ath_desc *nds, u64 tsf); |
671 | bool ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds, | 671 | void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds, |
672 | u32 size, u32 flags); | 672 | u32 size, u32 flags); |
673 | bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set); | 673 | bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set); |
674 | void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp); | 674 | void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp); |