ath9k: Remove bogus break after return
PATCH 1/2 ath9k: Remove bogus break after return
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath/ath9k/hw.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +0 -2
@@ -1617,11 +1617,9 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)switch (type) {case ATH9K_RESET_POWER_ON :return ath9k_hw_set_reset_power_on (ah); -break ;case ATH9K_RESET_WARM :case ATH9K_RESET_COLD :return ath9k_hw_set_reset (ah, type); -break ;default :return false; }
Signature · 1 line
1.6.2.4
PATCH 2/2 ath9k: Cleanup ineffective return values
This patch makes the return type of some of the functions void as those functions always return true
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath/ath9k/eeprom.c | 51 ++++++--------------------- drivers/net/wireless/ath/ath9k/eeprom.h | 2 +- drivers/net/wireless/ath/ath9k/hw.c | 57 ++++++++++-------------------- drivers/net/wireless/ath/ath9k/hw.h | 2 +- drivers/net/wireless/ath/ath9k/phy.c | 7 +--- drivers/net/wireless/ath/ath9k/phy.h | 2 +- 6 files changed, 36 insertions(+), 85 deletions(-)
drivers/net/wireless/ath/ath9k/eeprom.c +12 -39
@@ -694,7 +694,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,#undef TMP_VAL_VPD_TABLE } -static bool ath9k_hw_set_4k_power_cal_table (struct ath_hw *ah, +static void ath9k_hw_set_4k_power_cal_table (struct ath_hw *ah,struct ath9k_channel *chan,int16_t *pTxPowerIndexOffset) {
@@ -805,11 +805,9 @@ static bool ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah, } *pTxPowerIndexOffset =0 ; - -return true; } -static bool ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah, +static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah, struct ath9k_channel *chan, int16_t *ratesArray, u16 cfgCtl,
@@ -1041,10 +1039,9 @@ static bool ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah, ratesArray[rateExtOfdm] = targetPowerOfdmExt.tPow2x[0 ]; ratesArray[rateExtCck] = targetPowerCckExt.tPow2x[0 ]; } -return true; } -static int ath9k_hw_4k_set_txpower(struct ath_hw *ah, +static void ath9k_hw_4k_set_txpower(struct ath_hw *ah, struct ath9k_channel *chan, u16 cfgCtl, u8 twiceAntennaReduction,
@@ -1065,22 +1062,13 @@ static int ath9k_hw_4k_set_txpower(struct ath_hw *ah, ht40PowerIncForPdadc = pModal->ht40PowerIncForPdadc; } -if (!ath9k_hw_set_4k_power_per_rate_table (ah, chan, +ath9k_hw_set_4k_power_per_rate_table (ah, chan, &ratesArray[0 ], cfgCtl, twiceAntennaReduction, twiceMaxRegulatoryPower, - powerLimit)) { -DPRINTF (ah->ah_sc,ATH_DBG_EEPROM , -"ath9k_hw_set_txpower: unable to set " -"tx power per rate table\n" ); -return -EIO ; - } + powerLimit); -if (!ath9k_hw_set_4k_power_cal_table (ah, chan, &txPowerIndexOffset)) { -DPRINTF (ah->ah_sc,ATH_DBG_EEPROM , -"ath9k_hw_set_txpower: unable to set power table\n" ); -return -EIO ; - } +ath9k_hw_set_4k_power_cal_table (ah, chan, &txPowerIndexOffset);for (i =0 ; i <ARRAY_SIZE (ratesArray); i++) { ratesArray[i] = (int16_t )(txPowerIndexOffset + ratesArray[i]);
@@ -1168,7 +1156,6 @@ static int ath9k_hw_4k_set_txpower(struct ath_hw *ah,else ah->regulatory.max_power_level = ratesArray[i]; -return 0 ; } static void ath9k_hw_4k_set_addac(struct ath_hw *ah,
@@ -2103,7 +2090,7 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,return ; } -static bool ath9k_hw_set_def_power_cal_table (struct ath_hw *ah, +static void ath9k_hw_set_def_power_cal_table (struct ath_hw *ah,struct ath9k_channel *chan,int16_t *pTxPowerIndexOffset) {
@@ -2255,13 +2242,11 @@ static bool ath9k_hw_set_def_power_cal_table(struct ath_hw *ah, } *pTxPowerIndexOffset =0 ; - -return true;#undef SM_PD_GAIN#undef SM_PDGAIN_B } -static bool ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, +static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, struct ath9k_channel *chan, int16_t *ratesArray, u16 cfgCtl,
@@ -2549,10 +2534,9 @@ static bool ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, targetPowerCckExt.tPow2x[0 ]; } } -return true; } -static int ath9k_hw_def_set_txpower(struct ath_hw *ah, +static void ath9k_hw_def_set_txpower(struct ath_hw *ah, struct ath9k_channel *chan, u16 cfgCtl, u8 twiceAntennaReduction,
@@ -2575,22 +2559,13 @@ static int ath9k_hw_def_set_txpower(struct ath_hw *ah, ht40PowerIncForPdadc = pModal->ht40PowerIncForPdadc; } -if (!ath9k_hw_set_def_power_per_rate_table (ah, chan, +ath9k_hw_set_def_power_per_rate_table (ah, chan, &ratesArray[0 ], cfgCtl, twiceAntennaReduction, twiceMaxRegulatoryPower, - powerLimit)) { -DPRINTF (ah->ah_sc,ATH_DBG_EEPROM , -"ath9k_hw_set_txpower: unable to set " -"tx power per rate table\n" ); -return -EIO ; - } + powerLimit); -if (!ath9k_hw_set_def_power_cal_table (ah, chan, &txPowerIndexOffset)) { -DPRINTF (ah->ah_sc,ATH_DBG_EEPROM , -"ath9k_hw_set_txpower: unable to set power table\n" ); -return -EIO ; - } +ath9k_hw_set_def_power_cal_table (ah, chan, &txPowerIndexOffset);for (i =0 ; i <ARRAY_SIZE (ratesArray); i++) { ratesArray[i] = (int16_t )(txPowerIndexOffset + ratesArray[i]);
@@ -2717,8 +2692,6 @@ static int ath9k_hw_def_set_txpower(struct ath_hw *ah, "Invalid chainmask configuration\n");break ; } - -return 0 ; } static u8 ath9k_hw_def_get_num_ant_config(struct ath_hw *ah,
drivers/net/wireless/ath/ath9k/eeprom.h +1 -1
@@ -494,7 +494,7 @@ struct eeprom_ops { struct ath9k_channel *chan);void (*set_board_values)(struct ath_hw *hw,struct ath9k_channel *chan);void (*set_addac)(struct ath_hw *hw,struct ath9k_channel *chan); -int (*set_txpower)(struct ath_hw *hw,struct ath9k_channel *chan, +void (*set_txpower)(struct ath_hw *hw,struct ath9k_channel *chan,u16 cfgCtl,u8 twiceAntennaReduction,u8 twiceMaxRegulatoryPower,u8 powerLimit);u16 (*get_spur_channel)(struct ath_hw *ah,u16 i,bool is2GHz);
drivers/net/wireless/ath/ath9k/hw.c +19 -38
105 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/hw.h +1 -1
@@ -590,7 +590,7 @@ u32 ath9k_hw_getrxfilter(struct ath_hw *ah);void ath9k_hw_setrxfilter (struct ath_hw *ah,u32 bits);bool ath9k_hw_phy_disable (struct ath_hw *ah);bool ath9k_hw_disable (struct ath_hw *ah); -bool ath9k_hw_set_txpowerlimit (struct ath_hw *ah,u32 limit); +void ath9k_hw_set_txpowerlimit (struct ath_hw *ah,u32 limit);void ath9k_hw_setmac (struct ath_hw *ah,const u8 *mac);void ath9k_hw_setopmode (struct ath_hw *ah);void ath9k_hw_setmcastfilter (struct ath_hw *ah,u32 filter0,u32 filter1);
drivers/net/wireless/ath/ath9k/phy.c +2 -5
@@ -96,9 +96,8 @@ ath9k_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)return true; } -bool -ath9k_hw_ar9280_set_channel (struct ath_hw *ah, -struct ath9k_channel *chan) +void ath9k_hw_ar9280_set_channel (struct ath_hw *ah, +struct ath9k_channel *chan) {u16 bMode, fracMode, aModeRefSel =0 ;u32 freq, ndiv, channelSel =0 , channelFrac =0 , reg32 =0 ;
@@ -169,8 +168,6 @@ ath9k_hw_ar9280_set_channel(struct ath_hw *ah, ah->curchan = chan; ah->curchan_rad_index =-1 ; - -return true; } static void
drivers/net/wireless/ath/ath9k/phy.h +1 -1
@@ -17,7 +17,7 @@#ifndef PHY_H #define PHY_H -bool ath9k_hw_ar9280_set_channel (struct ath_hw *ah, +void ath9k_hw_ar9280_set_channel (struct ath_hw *ah,struct ath9k_channel *chan); bool ath9k_hw_set_channel(struct ath_hw *ah,
Signature · 1 line
1.6.2.4