ath5k: reduce checkpatch.pl errors
PATCH 1/1 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.
---
drivers/net/wireless/ath5k/base.c +5 -6
@@ -2521,8 +2521,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 ; }
@@ -2882,9 +2881,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 */
@@ -2947,7 +2946,7 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw, }/* 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 ]);
@@ -2964,7 +2963,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 */
drivers/net/wireless/ath5k/initvals.c +4 -4
@@ -1679,7 +1679,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,
@@ -1693,7 +1693,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),
@@ -1704,7 +1704,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),
@@ -1714,7 +1714,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),
drivers/net/wireless/ath5k/phy.c +3 -2
@@ -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 ; }
Quoted 7 lines · John Daiker
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 <[email protected]>
Please post patches inline if you can; they are easier to review that way.
One easy way to convince yourself (and us) that there are no code changes is to compile with and without the patch and compare resulting binaries for no differences.
All that said, I reviewed this one and it looks good...
Signature · 1 line
Bob Copeland %% www.bobcopeland.com
Nick Kossifidis
Acked-by2008/10/17 Bob Copeland <[email protected]>:
Quoted 15 lines · John Daiker
Quoted 7 lines
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 <[email protected]>Please post patches inline if you can; they are easier to review that way.
One easy way to convince yourself (and us) that there are no code changes is to compile with and without the patch and compare resulting binaries for no differences.
Quoted 7 lines
All that said, I reviewed this one and it looks good...
Reviewed-by Bob Copeland <[email protected]>--
Bob Copeland %% www.bobcopeland.com
Same here...
Signature · 3 lines
GPG ID: 0xD21DB2DB As you read this post global entropy rises. Have Fun ;-) Nick