aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Daiker <daikerjohn@gmail.com>2008-10-17 15:16:00 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:00:40 -0400
commit0bbac08f0a23898787978c0b405474e453e9824c (patch)
treed4931a377703853406e2328c612062439c73e19c
parent93da9cc17c5ae8a751886fd4732db89ad5e9bdb9 (diff)
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>
-rw-r--r--drivers/net/wireless/ath5k/base.c11
-rw-r--r--drivers/net/wireless/ath5k/initvals.c8
-rw-r--r--drivers/net/wireless/ath5k/phy.c5
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 3773d983ea66..6caabebc4c66 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -2528,8 +2528,7 @@ ath5k_register_led(struct ath5k_softc *sc, struct ath5k_led *led,
2528 led->led_dev.brightness_set = ath5k_led_brightness_set; 2528 led->led_dev.brightness_set = ath5k_led_brightness_set;
2529 2529
2530 err = led_classdev_register(&sc->pdev->dev, &led->led_dev); 2530 err = led_classdev_register(&sc->pdev->dev, &led->led_dev);
2531 if (err) 2531 if (err) {
2532 {
2533 ATH5K_WARN(sc, "could not register LED %s\n", name); 2532 ATH5K_WARN(sc, "could not register LED %s\n", name);
2534 led->sc = NULL; 2533 led->sc = NULL;
2535 } 2534 }
@@ -2890,9 +2889,9 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
2890 if (*new_flags & FIF_PROMISC_IN_BSS) { 2889 if (*new_flags & FIF_PROMISC_IN_BSS) {
2891 rfilt |= AR5K_RX_FILTER_PROM; 2890 rfilt |= AR5K_RX_FILTER_PROM;
2892 __set_bit(ATH_STAT_PROMISC, sc->status); 2891 __set_bit(ATH_STAT_PROMISC, sc->status);
2893 } 2892 } else {
2894 else
2895 __clear_bit(ATH_STAT_PROMISC, sc->status); 2893 __clear_bit(ATH_STAT_PROMISC, sc->status);
2894 }
2896 } 2895 }
2897 2896
2898 /* Note, AR5K_RX_FILTER_MCAST is already enabled */ 2897 /* Note, AR5K_RX_FILTER_MCAST is already enabled */
@@ -2956,7 +2955,7 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
2956 AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM; 2955 AR5K_RX_FILTER_PROBEREQ | AR5K_RX_FILTER_PROM;
2957 2956
2958 /* Set filters */ 2957 /* Set filters */
2959 ath5k_hw_set_rx_filter(ah,rfilt); 2958 ath5k_hw_set_rx_filter(ah, rfilt);
2960 2959
2961 /* Set multicast bits */ 2960 /* Set multicast bits */
2962 ath5k_hw_set_mcast_filter(ah, mfilt[0], mfilt[1]); 2961 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,
2973 struct ath5k_softc *sc = hw->priv; 2972 struct ath5k_softc *sc = hw->priv;
2974 int ret = 0; 2973 int ret = 0;
2975 2974
2976 switch(key->alg) { 2975 switch (key->alg) {
2977 case ALG_WEP: 2976 case ALG_WEP:
2978 /* XXX: fix hardware encryption, its not working. For now 2977 /* XXX: fix hardware encryption, its not working. For now
2979 * allow software encryption */ 2978 * allow software encryption */
diff --git a/drivers/net/wireless/ath5k/initvals.c b/drivers/net/wireless/ath5k/initvals.c
index ceaa6c475c06..450bd6e945ff 100644
--- a/drivers/net/wireless/ath5k/initvals.c
+++ b/drivers/net/wireless/ath5k/initvals.c
@@ -1681,7 +1681,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
1681 */ 1681 */
1682 1682
1683 /* For AR5212 and combatible */ 1683 /* For AR5212 and combatible */
1684 if (ah->ah_version == AR5K_AR5212){ 1684 if (ah->ah_version == AR5K_AR5212) {
1685 1685
1686 /* First set of mode-specific settings */ 1686 /* First set of mode-specific settings */
1687 ath5k_hw_ini_mode_registers(ah, 1687 ath5k_hw_ini_mode_registers(ah,
@@ -1695,7 +1695,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
1695 ar5212_ini, change_channel); 1695 ar5212_ini, change_channel);
1696 1696
1697 /* Second set of mode-specific settings */ 1697 /* Second set of mode-specific settings */
1698 if (ah->ah_radio == AR5K_RF5111){ 1698 if (ah->ah_radio == AR5K_RF5111) {
1699 1699
1700 ath5k_hw_ini_mode_registers(ah, 1700 ath5k_hw_ini_mode_registers(ah,
1701 ARRAY_SIZE(ar5212_rf5111_ini_mode_end), 1701 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)
1706 ARRAY_SIZE(rf5111_ini_bbgain), 1706 ARRAY_SIZE(rf5111_ini_bbgain),
1707 rf5111_ini_bbgain, change_channel); 1707 rf5111_ini_bbgain, change_channel);
1708 1708
1709 } else if (ah->ah_radio == AR5K_RF5112){ 1709 } else if (ah->ah_radio == AR5K_RF5112) {
1710 1710
1711 ath5k_hw_ini_mode_registers(ah, 1711 ath5k_hw_ini_mode_registers(ah,
1712 ARRAY_SIZE(ar5212_rf5112_ini_mode_end), 1712 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)
1716 ARRAY_SIZE(rf5112_ini_bbgain), 1716 ARRAY_SIZE(rf5112_ini_bbgain),
1717 rf5112_ini_bbgain, change_channel); 1717 rf5112_ini_bbgain, change_channel);
1718 1718
1719 } else if (ah->ah_radio == AR5K_RF5413){ 1719 } else if (ah->ah_radio == AR5K_RF5413) {
1720 1720
1721 ath5k_hw_ini_mode_registers(ah, 1721 ath5k_hw_ini_mode_registers(ah,
1722 ARRAY_SIZE(rf5413_ini_mode_end), 1722 ARRAY_SIZE(rf5413_ini_mode_end),
diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c
index e43f6563e61a..69625bf4d11c 100644
--- a/drivers/net/wireless/ath5k/phy.c
+++ b/drivers/net/wireless/ath5k/phy.c
@@ -1412,7 +1412,8 @@ static int ath5k_hw_rf5112_rfregs(struct ath5k_hw *ah,
1412 rf_ini = rfregs_2112a; 1412 rf_ini = rfregs_2112a;
1413 rf_size = ARRAY_SIZE(rfregs_5112a); 1413 rf_size = ARRAY_SIZE(rfregs_5112a);
1414 if (mode < 2) { 1414 if (mode < 2) {
1415 ATH5K_ERR(ah->ah_sc,"invalid channel mode: %i\n",mode); 1415 ATH5K_ERR(ah->ah_sc, "invalid channel mode: %i\n",
1416 mode);
1416 return -EINVAL; 1417 return -EINVAL;
1417 } 1418 }
1418 mode = mode - 2; /*no a/turboa modes for 2112*/ 1419 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)
1708 if (ah->ah_radio >= AR5K_RF5112) { 1709 if (ah->ah_radio >= AR5K_RF5112) {
1709 ath5k_hw_rfregs_gainf_corr(ah); 1710 ath5k_hw_rfregs_gainf_corr(ah);
1710 ah->ah_gain.g_current = 1711 ah->ah_gain.g_current =
1711 ah->ah_gain.g_current>=ah->ah_gain.g_f_corr ? 1712 ah->ah_gain.g_current >= ah->ah_gain.g_f_corr ?
1712 (ah->ah_gain.g_current-ah->ah_gain.g_f_corr) : 1713 (ah->ah_gain.g_current-ah->ah_gain.g_f_corr) :
1713 0; 1714 0;
1714 } 1715 }