ath5k: reduce checkpatch.pl errors
A few changes to reduce checkpatch.pl errors in the ath5k driver. For the most part, I only fixed cosmetic things, and left the actual 'code flow' untouched (hopefully)! Diff is against wireless-testing HEAD. Signed-off-by: John Daiker <daikerjohn@gmail.com> Reviewed-by: Bob Copeland <me@bobcopeland.com> Acked-by: Nick Kossifidis <mickflemm@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
93da9cc17c
Коммит
0bbac08f0a
|
@ -2528,8 +2528,7 @@ ath5k_register_led(struct ath5k_softc *sc, struct ath5k_led *led,
|
|||
led->led_dev.brightness_set = ath5k_led_brightness_set;
|
||||
|
||||
err = led_classdev_register(&sc->pdev->dev, &led->led_dev);
|
||||
if (err)
|
||||
{
|
||||
if (err) {
|
||||
ATH5K_WARN(sc, "could not register LED %s\n", name);
|
||||
led->sc = NULL;
|
||||
}
|
||||
|
@ -2890,9 +2889,9 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
|
|||
if (*new_flags & FIF_PROMISC_IN_BSS) {
|
||||
rfilt |= AR5K_RX_FILTER_PROM;
|
||||
__set_bit(ATH_STAT_PROMISC, sc->status);
|
||||
}
|
||||
else
|
||||
} else {
|
||||
__clear_bit(ATH_STAT_PROMISC, sc->status);
|
||||
}
|
||||
}
|
||||
|
||||
/* Note, AR5K_RX_FILTER_MCAST is already enabled */
|
||||
|
@ -2956,7 +2955,7 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
|
|||
AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM;
|
||||
|
||||
/* Set filters */
|
||||
ath5k_hw_set_rx_filter(ah,rfilt);
|
||||
ath5k_hw_set_rx_filter(ah, rfilt);
|
||||
|
||||
/* Set multicast bits */
|
||||
ath5k_hw_set_mcast_filter(ah, mfilt[0], mfilt[1]);
|
||||
|
@ -2973,7 +2972,7 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
|
|||
struct ath5k_softc *sc = hw->priv;
|
||||
int ret = 0;
|
||||
|
||||
switch(key->alg) {
|
||||
switch (key->alg) {
|
||||
case ALG_WEP:
|
||||
/* XXX: fix hardware encryption, its not working. For now
|
||||
* allow software encryption */
|
||||
|
|
|
@ -1681,7 +1681,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
|
|||
*/
|
||||
|
||||
/* For AR5212 and combatible */
|
||||
if (ah->ah_version == AR5K_AR5212){
|
||||
if (ah->ah_version == AR5K_AR5212) {
|
||||
|
||||
/* First set of mode-specific settings */
|
||||
ath5k_hw_ini_mode_registers(ah,
|
||||
|
@ -1695,7 +1695,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
|
|||
ar5212_ini, change_channel);
|
||||
|
||||
/* Second set of mode-specific settings */
|
||||
if (ah->ah_radio == AR5K_RF5111){
|
||||
if (ah->ah_radio == AR5K_RF5111) {
|
||||
|
||||
ath5k_hw_ini_mode_registers(ah,
|
||||
ARRAY_SIZE(ar5212_rf5111_ini_mode_end),
|
||||
|
@ -1706,7 +1706,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
|
|||
ARRAY_SIZE(rf5111_ini_bbgain),
|
||||
rf5111_ini_bbgain, change_channel);
|
||||
|
||||
} else if (ah->ah_radio == AR5K_RF5112){
|
||||
} else if (ah->ah_radio == AR5K_RF5112) {
|
||||
|
||||
ath5k_hw_ini_mode_registers(ah,
|
||||
ARRAY_SIZE(ar5212_rf5112_ini_mode_end),
|
||||
|
@ -1716,7 +1716,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
|
|||
ARRAY_SIZE(rf5112_ini_bbgain),
|
||||
rf5112_ini_bbgain, change_channel);
|
||||
|
||||
} else if (ah->ah_radio == AR5K_RF5413){
|
||||
} else if (ah->ah_radio == AR5K_RF5413) {
|
||||
|
||||
ath5k_hw_ini_mode_registers(ah,
|
||||
ARRAY_SIZE(rf5413_ini_mode_end),
|
||||
|
|
|
@ -1412,7 +1412,8 @@ static int ath5k_hw_rf5112_rfregs(struct ath5k_hw *ah,
|
|||
rf_ini = rfregs_2112a;
|
||||
rf_size = ARRAY_SIZE(rfregs_5112a);
|
||||
if (mode < 2) {
|
||||
ATH5K_ERR(ah->ah_sc,"invalid channel mode: %i\n",mode);
|
||||
ATH5K_ERR(ah->ah_sc, "invalid channel mode: %i\n",
|
||||
mode);
|
||||
return -EINVAL;
|
||||
}
|
||||
mode = mode - 2; /*no a/turboa modes for 2112*/
|
||||
|
@ -1708,7 +1709,7 @@ enum ath5k_rfgain ath5k_hw_get_rf_gain(struct ath5k_hw *ah)
|
|||
if (ah->ah_radio >= AR5K_RF5112) {
|
||||
ath5k_hw_rfregs_gainf_corr(ah);
|
||||
ah->ah_gain.g_current =
|
||||
ah->ah_gain.g_current>=ah->ah_gain.g_f_corr ?
|
||||
ah->ah_gain.g_current >= ah->ah_gain.g_f_corr ?
|
||||
(ah->ah_gain.g_current-ah->ah_gain.g_f_corr) :
|
||||
0;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче