ath5k: replace spaces with tabs as suggested by checkpatch.pl

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

10 files changed, 94 insertions, 94 deletions

diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index c4c02d5145c2..79e11ff40fc3 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -39,34 +39,34 @@
 #include "../ath.h"
 
 /* PCI IDs */
-#define PCI_DEVICE_ID_ATHEROS_AR5210            0x0007 /* AR5210 */
-#define PCI_DEVICE_ID_ATHEROS_AR5311            0x0011 /* AR5311 */
-#define PCI_DEVICE_ID_ATHEROS_AR5211            0x0012 /* AR5211 */
-#define PCI_DEVICE_ID_ATHEROS_AR5212            0x0013 /* AR5212 */
-#define PCI_DEVICE_ID_3COM_3CRDAG675            0x0013 /* 3CRDAG675 (Atheros AR5212) */
-#define PCI_DEVICE_ID_3COM_2_3CRPAG175          0x0013 /* 3CRPAG175 (Atheros AR5212) */
-#define PCI_DEVICE_ID_ATHEROS_AR5210_AP         0x0207 /* AR5210 (Early) */
+#define PCI_DEVICE_ID_ATHEROS_AR5210            0x0007 /* AR5210 */
+#define PCI_DEVICE_ID_ATHEROS_AR5311            0x0011 /* AR5311 */
+#define PCI_DEVICE_ID_ATHEROS_AR5211            0x0012 /* AR5211 */
+#define PCI_DEVICE_ID_ATHEROS_AR5212            0x0013 /* AR5212 */
+#define PCI_DEVICE_ID_3COM_3CRDAG675            0x0013 /* 3CRDAG675 (Atheros AR5212) */
+#define PCI_DEVICE_ID_3COM_2_3CRPAG175          0x0013 /* 3CRPAG175 (Atheros AR5212) */
+#define PCI_DEVICE_ID_ATHEROS_AR5210_AP         0x0207 /* AR5210 (Early) */
 #define PCI_DEVICE_ID_ATHEROS_AR5212_IBM        0x1014 /* AR5212 (IBM MiniPCI) */
-#define PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT    0x1107 /* AR5210 (no eeprom) */
-#define PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT    0x1113 /* AR5212 (no eeprom) */
-#define PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT    0x1112 /* AR5211 (no eeprom) */
-#define PCI_DEVICE_ID_ATHEROS_AR5212_FPGA       0xf013 /* AR5212 (emulation board) */
-#define PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY     0xff12 /* AR5211 (emulation board) */
-#define PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B    0xf11b /* AR5211 (emulation board) */
-#define PCI_DEVICE_ID_ATHEROS_AR5312_REV2       0x0052 /* AR5312 WMAC (AP31) */
-#define PCI_DEVICE_ID_ATHEROS_AR5312_REV7       0x0057 /* AR5312 WMAC (AP30-040) */
-#define PCI_DEVICE_ID_ATHEROS_AR5312_REV8       0x0058 /* AR5312 WMAC (AP43-030) */
-#define PCI_DEVICE_ID_ATHEROS_AR5212_0014       0x0014 /* AR5212 compatible */
-#define PCI_DEVICE_ID_ATHEROS_AR5212_0015       0x0015 /* AR5212 compatible */
-#define PCI_DEVICE_ID_ATHEROS_AR5212_0016       0x0016 /* AR5212 compatible */
-#define PCI_DEVICE_ID_ATHEROS_AR5212_0017       0x0017 /* AR5212 compatible */
-#define PCI_DEVICE_ID_ATHEROS_AR5212_0018       0x0018 /* AR5212 compatible */
-#define PCI_DEVICE_ID_ATHEROS_AR5212_0019       0x0019 /* AR5212 compatible */
-#define PCI_DEVICE_ID_ATHEROS_AR2413            0x001a /* AR2413 (Griffin-lite) */
-#define PCI_DEVICE_ID_ATHEROS_AR5413            0x001b /* AR5413 (Eagle) */
-#define PCI_DEVICE_ID_ATHEROS_AR5424            0x001c /* AR5424 (Condor PCI-E) */
-#define PCI_DEVICE_ID_ATHEROS_AR5416            0x0023 /* AR5416 */
-#define PCI_DEVICE_ID_ATHEROS_AR5418            0x0024 /* AR5418 */
+#define PCI_DEVICE_ID_ATHEROS_AR5210_DEFAULT    0x1107 /* AR5210 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_DEFAULT    0x1113 /* AR5212 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_DEFAULT    0x1112 /* AR5211 (no eeprom) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_FPGA       0xf013 /* AR5212 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_LEGACY     0xff12 /* AR5211 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5211_FPGA11B    0xf11b /* AR5211 (emulation board) */
+#define PCI_DEVICE_ID_ATHEROS_AR5312_REV2       0x0052 /* AR5312 WMAC (AP31) */
+#define PCI_DEVICE_ID_ATHEROS_AR5312_REV7       0x0057 /* AR5312 WMAC (AP30-040) */
+#define PCI_DEVICE_ID_ATHEROS_AR5312_REV8       0x0058 /* AR5312 WMAC (AP43-030) */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0014       0x0014 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0015       0x0015 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0016       0x0016 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0017       0x0017 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0018       0x0018 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR5212_0019       0x0019 /* AR5212 compatible */
+#define PCI_DEVICE_ID_ATHEROS_AR2413            0x001a /* AR2413 (Griffin-lite) */
+#define PCI_DEVICE_ID_ATHEROS_AR5413            0x001b /* AR5413 (Eagle) */
+#define PCI_DEVICE_ID_ATHEROS_AR5424            0x001c /* AR5424 (Condor PCI-E) */
+#define PCI_DEVICE_ID_ATHEROS_AR5416            0x0023 /* AR5416 */
+#define PCI_DEVICE_ID_ATHEROS_AR5418            0x0024 /* AR5418 */
 
 /****************************\
   GENERIC DRIVER DEFINITIONS
@@ -374,7 +374,7 @@ struct ath5k_srev_name {
  * they are exclusive.
  *
  */
-#define MODULATION_XR           0x00000200
+#define MODULATION_XR           0x00000200
 /*
  * Modulation for Atheros' Turbo G and Turbo A, its supposed to provide a
  * throughput transmission speed up to 40Mbit/s-60Mbit/s at a 108Mbit/s
@@ -495,9 +495,9 @@ enum ath5k_tx_queue {
  */
 enum ath5k_tx_queue_subtype {
         AR5K_WME_AC_BK = 0,     /*Background traffic*/
-        AR5K_WME_AC_BE,         /*Best-effort (normal) traffic)*/
-        AR5K_WME_AC_VI,         /*Video traffic*/
-        AR5K_WME_AC_VO,         /*Voice traffic*/
+        AR5K_WME_AC_BE,         /*Best-effort (normal) traffic)*/
+        AR5K_WME_AC_VI,         /*Video traffic*/
+        AR5K_WME_AC_VO,         /*Voice traffic*/
 };
 
 /*
@@ -791,47 +791,47 @@ extern int ath5k_modparam_nohwcrypt;
  * enum ath5k_int - Hardware interrupt masks helpers
  *
  * @AR5K_INT_RX: mask to identify received frame interrupts, of type
- *      AR5K_ISR_RXOK or AR5K_ISR_RXERR
+ *      AR5K_ISR_RXOK or AR5K_ISR_RXERR
  * @AR5K_INT_RXDESC: Request RX descriptor/Read RX descriptor (?)
  * @AR5K_INT_RXNOFRM: No frame received (?)
  * @AR5K_INT_RXEOL: received End Of List for VEOL (Virtual End Of List). The
- *      Queue Control Unit (QCU) signals an EOL interrupt only if a descriptor's
- *      LinkPtr is NULL. For more details, refer to:
- *      http://www.freepatentsonline.com/20030225739.html
+ *      Queue Control Unit (QCU) signals an EOL interrupt only if a descriptor's
+ *      LinkPtr is NULL. For more details, refer to:
+ *      http://www.freepatentsonline.com/20030225739.html
  * @AR5K_INT_RXORN: Indicates we got RX overrun (eg. no more descriptors).
- *      Note that Rx overrun is not always fatal, on some chips we can continue
- *      operation without reseting the card, that's why int_fatal is not
- *      common for all chips.
+ *      Note that Rx overrun is not always fatal, on some chips we can continue
+ *      operation without reseting the card, that's why int_fatal is not
+ *      common for all chips.
  * @AR5K_INT_TX: mask to identify received frame interrupts, of type
- *      AR5K_ISR_TXOK or AR5K_ISR_TXERR
+ *      AR5K_ISR_TXOK or AR5K_ISR_TXERR
  * @AR5K_INT_TXDESC: Request TX descriptor/Read TX status descriptor (?)
  * @AR5K_INT_TXURN: received when we should increase the TX trigger threshold
- *      We currently do increments on interrupt by
- *      (AR5K_TUNE_MAX_TX_FIFO_THRES - current_trigger_level) / 2
+ *      We currently do increments on interrupt by
+ *      (AR5K_TUNE_MAX_TX_FIFO_THRES - current_trigger_level) / 2
  * @AR5K_INT_MIB: Indicates the either Management Information Base counters or
  *      one of the PHY error counters reached the maximum value and should be
  *      read and cleared.
  * @AR5K_INT_RXPHY: RX PHY Error
  * @AR5K_INT_RXKCM: RX Key cache miss
  * @AR5K_INT_SWBA: SoftWare Beacon Alert - indicates its time to send a
- *      beacon that must be handled in software. The alternative is if you
- *      have VEOL support, in that case you let the hardware deal with things.
+ *      beacon that must be handled in software. The alternative is if you
+ *      have VEOL support, in that case you let the hardware deal with things.
  * @AR5K_INT_BMISS: If in STA mode this indicates we have stopped seeing
- *      beacons from the AP have associated with, we should probably try to
- *      reassociate. When in IBSS mode this might mean we have not received
- *      any beacons from any local stations. Note that every station in an
- *      IBSS schedules to send beacons at the Target Beacon Transmission Time
- *      (TBTT) with a random backoff.
+ *      beacons from the AP have associated with, we should probably try to
+ *      reassociate. When in IBSS mode this might mean we have not received
+ *      any beacons from any local stations. Note that every station in an
+ *      IBSS schedules to send beacons at the Target Beacon Transmission Time
+ *      (TBTT) with a random backoff.
  * @AR5K_INT_BNR: Beacon Not Ready interrupt - ??
  * @AR5K_INT_GPIO: GPIO interrupt is used for RF Kill, disabled for now
- *      until properly handled
+ *      until properly handled
  * @AR5K_INT_FATAL: Fatal errors were encountered, typically caused by DMA
- *      errors. These types of errors we can enable seem to be of type
- *      AR5K_SIMR2_MCABT, AR5K_SIMR2_SSERR and AR5K_SIMR2_DPERR.
+ *      errors. These types of errors we can enable seem to be of type
+ *      AR5K_SIMR2_MCABT, AR5K_SIMR2_SSERR and AR5K_SIMR2_DPERR.
  * @AR5K_INT_GLOBAL: Used to clear and set the IER
  * @AR5K_INT_NOCARD: signals the card has been removed
  * @AR5K_INT_COMMON: common interrupts shared amogst MACs with the same
- *      bit value
+ *      bit value
  *
  * These are mapped to take advantage of some common bits
  * between the MACs, to be able to set intr properties
@@ -968,9 +968,9 @@ enum ath5k_capability_type {
         AR5K_CAP_MCAST_KEYSRCH          = 14,   /* Supports multicast key search */
         AR5K_CAP_TSF_ADJUST             = 15,   /* Supports beacon tsf adjust */
         AR5K_CAP_XR                     = 16,   /* Supports XR mode */
-        AR5K_CAP_WME_TKIPMIC            = 17,   /* Supports TKIP MIC when using WMM */
-        AR5K_CAP_CHAN_HALFRATE          = 18,   /* Supports half rate channels */
-        AR5K_CAP_CHAN_QUARTERRATE       = 19,   /* Supports quarter rate channels */
+        AR5K_CAP_WME_TKIPMIC            = 17,   /* Supports TKIP MIC when using WMM */
+        AR5K_CAP_CHAN_HALFRATE          = 18,   /* Supports half rate channels */
+        AR5K_CAP_CHAN_QUARTERRATE       = 19,   /* Supports quarter rate channels */
         AR5K_CAP_RFSILENT               = 20,   /* Supports RFsilent */
 };
 
@@ -1362,12 +1362,12 @@ int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,
 
 static inline struct ath_common *ath5k_hw_common(struct ath5k_hw *ah)
 {
-        return &ah->common;
+        return &ah->common;
 }
 
 static inline struct ath_regulatory *ath5k_hw_regulatory(struct ath5k_hw *ah)
 {
-        return &(ath5k_hw_common(ah)->regulatory);
+        return &(ath5k_hw_common(ah)->regulatory);
 }
 
 #ifdef CONFIG_ATHEROS_AR231X
diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h
index b294f3305011..3016562a7711 100644
--- a/drivers/net/wireless/ath/ath5k/base.h
+++ b/drivers/net/wireless/ath/ath5k/base.h
@@ -251,7 +251,7 @@ struct ath5k_softc {
         unsigned int            nexttbtt;       /* next beacon time in TU */
         struct ath5k_txq        *cabq;          /* content after beacon */
 
-        int                     power_level;    /* Requested tx power in dbm */
+        int                     power_level;    /* Requested tx power in dbm */
         bool                    assoc;          /* associate state */
         bool                    enable_beacon;  /* true if beacons are on */
 
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index 1fef84f87c78..4198f4ef88d9 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -223,14 +223,14 @@ static int ath5k_eeprom_read_ants(struct ath5k_hw *ah, u32 *offset,
         ah->ah_ant_ctl[mode][AR5K_ANT_CTL] =
             (ee->ee_ant_control[mode][0] << 4);
         ah->ah_ant_ctl[mode][AR5K_ANT_SWTABLE_A] =
-             ee->ee_ant_control[mode][1]        |
-            (ee->ee_ant_control[mode][2] << 6)  |
+             ee->ee_ant_control[mode][1]        |
+            (ee->ee_ant_control[mode][2] << 6)  |
             (ee->ee_ant_control[mode][3] << 12) |
             (ee->ee_ant_control[mode][4] << 18) |
             (ee->ee_ant_control[mode][5] << 24);
         ah->ah_ant_ctl[mode][AR5K_ANT_SWTABLE_B] =
-             ee->ee_ant_control[mode][6]        |
-            (ee->ee_ant_control[mode][7] << 6)  |
+             ee->ee_ant_control[mode][6]        |
+            (ee->ee_ant_control[mode][7] << 6)  |
             (ee->ee_ant_control[mode][8] << 12) |
             (ee->ee_ant_control[mode][9] << 18) |
             (ee->ee_ant_control[mode][10] << 24);
diff --git a/drivers/net/wireless/ath/ath5k/initvals.c b/drivers/net/wireless/ath/ath5k/initvals.c
index e49340d18df4..4bfdc2e20dfa 100644
--- a/drivers/net/wireless/ath/ath5k/initvals.c
+++ b/drivers/net/wireless/ath/ath5k/initvals.c
@@ -113,8 +113,8 @@ static const struct ath5k_ini ar5210_ini[] = {
         { AR5K_PHY(28), 0x0000000f },
         { AR5K_PHY(29), 0x00000080 },
         { AR5K_PHY(30), 0x00000004 },
-        { AR5K_PHY(31), 0x00000018 },   /* 0x987c */
-        { AR5K_PHY(64), 0x00000000 },   /* 0x9900 */
+        { AR5K_PHY(31), 0x00000018 },   /* 0x987c */
+        { AR5K_PHY(64), 0x00000000 },   /* 0x9900 */
         { AR5K_PHY(65), 0x00000000 },
         { AR5K_PHY(66), 0x00000000 },
         { AR5K_PHY(67), 0x00800000 },
@@ -549,7 +549,7 @@ static const struct ath5k_ini ar5212_ini_common_start[] = {
         { AR5K_DIAG_SW_5211,    0x00000000 },
         { AR5K_ADDAC_TEST,      0x00000000 },
         { AR5K_DEFAULT_ANTENNA, 0x00000000 },
-        { AR5K_FRAME_CTL_QOSM,  0x000fc78f },
+        { AR5K_FRAME_CTL_QOSM,  0x000fc78f },
         { AR5K_XRMODE,          0x2a82301a },
         { AR5K_XRDELAY,         0x05dc01e0 },
         { AR5K_XRTIMEOUT,       0x1f402710 },
@@ -760,9 +760,9 @@ static const struct ath5k_ini_mode rf5111_ini_mode_end[] = {
 
 static const struct ath5k_ini rf5111_ini_common_end[] = {
         { AR5K_DCU_FP,          0x00000000 },
-        { AR5K_PHY_AGC,         0x00000000 },
-        { AR5K_PHY_ADC_CTL,     0x00022ffe },
-        { 0x983c,               0x00020100 },
+        { AR5K_PHY_AGC,         0x00000000 },
+        { AR5K_PHY_ADC_CTL,     0x00022ffe },
+        { 0x983c,               0x00020100 },
         { AR5K_PHY_GAIN_OFFSET, 0x1284613c },
         { AR5K_PHY_PAPD_PROBE,  0x00004883 },
         { 0x9940,               0x00000004 },
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 55441913344d..4e982b65404a 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -2456,7 +2456,7 @@ static void
 ath5k_fill_pwr_to_pcdac_table(struct ath5k_hw *ah, s16* table_min,
                                                         s16 *table_max)
 {
-        u8      *pcdac_out = ah->ah_txpower.txp_pd_table;
+        u8      *pcdac_out = ah->ah_txpower.txp_pd_table;
         u8      *pcdac_tmp = ah->ah_txpower.tmpL[0];
         u8      pcdac_0, pcdac_n, pcdac_i, pwr_idx, i;
         s16     min_pwr, max_pwr;
@@ -2502,7 +2502,7 @@ static void
 ath5k_combine_linear_pcdac_curves(struct ath5k_hw *ah, s16* table_min,
                                                 s16 *table_max, u8 pdcurves)
 {
-        u8      *pcdac_out = ah->ah_txpower.txp_pd_table;
+        u8      *pcdac_out = ah->ah_txpower.txp_pd_table;
         u8      *pcdac_low_pwr;
         u8      *pcdac_high_pwr;
         u8      *pcdac_tmp;
@@ -2596,7 +2596,7 @@ ath5k_combine_linear_pcdac_curves(struct ath5k_hw *ah, s16* table_min,
 static void
 ath5k_write_pcdac_table(struct ath5k_hw *ah)
 {
-        u8      *pcdac_out = ah->ah_txpower.txp_pd_table;
+        u8      *pcdac_out = ah->ah_txpower.txp_pd_table;
         int     i;
 
         /*
diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h
index d12b827033c1..060a4c522ab2 100644
--- a/drivers/net/wireless/ath/ath5k/reg.h
+++ b/drivers/net/wireless/ath/ath5k/reg.h
@@ -72,7 +72,7 @@
 #define AR5K_CFG_SWRD           0x00000004      /* Byte-swap RX descriptor */
 #define AR5K_CFG_SWRB           0x00000008      /* Byte-swap RX buffer */
 #define AR5K_CFG_SWRG           0x00000010      /* Byte-swap Register access */
-#define AR5K_CFG_IBSS           0x00000020      /* 0-BSS, 1-IBSS [5211+] */
+#define AR5K_CFG_IBSS           0x00000020      /* 0-BSS, 1-IBSS [5211+] */
 #define AR5K_CFG_PHY_OK         0x00000100      /* [5211+] */
 #define AR5K_CFG_EEBS           0x00000200      /* EEPROM is busy */
 #define AR5K_CFG_CLKGD          0x00000400      /* Clock gated (Disable dynamic clock) */
@@ -303,7 +303,7 @@
 #define AR5K_ISR_BRSSI          0x00020000      /* Beacon rssi below threshold (?) */
 #define AR5K_ISR_BMISS          0x00040000      /* Beacon missed */
 #define AR5K_ISR_HIUERR         0x00080000      /* Host Interface Unit error [5211+] */
-#define AR5K_ISR_BNR            0x00100000      /* Beacon not ready [5211+] */
+#define AR5K_ISR_BNR            0x00100000      /* Beacon not ready [5211+] */
 #define AR5K_ISR_MCABT          0x00100000      /* Master Cycle Abort [5210] */
 #define AR5K_ISR_RXCHIRP        0x00200000      /* CHIRP Received [5212+] */
 #define AR5K_ISR_SSERR          0x00200000      /* Signaled System Error [5210] */
@@ -397,7 +397,7 @@
 #define AR5K_IMR_BRSSI          0x00020000      /* Beacon rssi below threshold (?) */
 #define AR5K_IMR_BMISS          0x00040000      /* Beacon missed*/
 #define AR5K_IMR_HIUERR         0x00080000      /* Host Interface Unit error [5211+] */
-#define AR5K_IMR_BNR            0x00100000      /* Beacon not ready [5211+] */
+#define AR5K_IMR_BNR            0x00100000      /* Beacon not ready [5211+] */
 #define AR5K_IMR_MCABT          0x00100000      /* Master Cycle Abort [5210] */
 #define AR5K_IMR_RXCHIRP        0x00200000      /* CHIRP Received [5212+]*/
 #define AR5K_IMR_SSERR          0x00200000      /* Signaled System Error [5210] */
@@ -1328,16 +1328,16 @@
 #define AR5K_RX_FILTER_5211     0x803c                  /* Register Address [5211+] */
 #define AR5K_RX_FILTER          (ah->ah_version == AR5K_AR5210 ? \
                                 AR5K_RX_FILTER_5210 : AR5K_RX_FILTER_5211)
-#define AR5K_RX_FILTER_UCAST    0x00000001      /* Don't filter unicast frames */
-#define AR5K_RX_FILTER_MCAST    0x00000002      /* Don't filter multicast frames */
-#define AR5K_RX_FILTER_BCAST    0x00000004      /* Don't filter broadcast frames */
-#define AR5K_RX_FILTER_CONTROL  0x00000008      /* Don't filter control frames */
-#define AR5K_RX_FILTER_BEACON   0x00000010      /* Don't filter beacon frames */
-#define AR5K_RX_FILTER_PROM     0x00000020      /* Set promiscuous mode */
-#define AR5K_RX_FILTER_XRPOLL   0x00000040      /* Don't filter XR poll frame [5212+] */
+#define AR5K_RX_FILTER_UCAST    0x00000001      /* Don't filter unicast frames */
+#define AR5K_RX_FILTER_MCAST    0x00000002      /* Don't filter multicast frames */
+#define AR5K_RX_FILTER_BCAST    0x00000004      /* Don't filter broadcast frames */
+#define AR5K_RX_FILTER_CONTROL  0x00000008      /* Don't filter control frames */
+#define AR5K_RX_FILTER_BEACON   0x00000010      /* Don't filter beacon frames */
+#define AR5K_RX_FILTER_PROM     0x00000020      /* Set promiscuous mode */
+#define AR5K_RX_FILTER_XRPOLL   0x00000040      /* Don't filter XR poll frame [5212+] */
 #define AR5K_RX_FILTER_PROBEREQ 0x00000080      /* Don't filter probe requests [5212+] */
 #define AR5K_RX_FILTER_PHYERR_5212      0x00000100      /* Don't filter phy errors [5212+] */
-#define AR5K_RX_FILTER_RADARERR_5212    0x00000200      /* Don't filter phy radar errors [5212+] */
+#define AR5K_RX_FILTER_RADARERR_5212    0x00000200      /* Don't filter phy radar errors [5212+] */
 #define AR5K_RX_FILTER_PHYERR_5211      0x00000040      /* [5211] */
 #define AR5K_RX_FILTER_RADARERR_5211    0x00000080      /* [5211] */
 #define AR5K_RX_FILTER_PHYERR  \
@@ -1461,7 +1461,7 @@
  * ADDAC test register [5211+]
  */
 #define AR5K_ADDAC_TEST                 0x8054                  /* Register Address */
-#define AR5K_ADDAC_TEST_TXCONT          0x00000001      /* Test continuous tx */
+#define AR5K_ADDAC_TEST_TXCONT          0x00000001      /* Test continuous tx */
 #define AR5K_ADDAC_TEST_TST_MODE        0x00000002      /* Test mode */
 #define AR5K_ADDAC_TEST_LOOP_EN         0x00000004      /* Enable loop */
 #define AR5K_ADDAC_TEST_LOOP_LEN        0x00000008      /* Loop length (field) */
@@ -2038,7 +2038,7 @@
 #define AR5K_PHY_WEAK_OFDM_HIGH_THR_M2_S        24
 
 /* Low thresholds */
-#define AR5K_PHY_WEAK_OFDM_LOW_THR              0x986c
+#define AR5K_PHY_WEAK_OFDM_LOW_THR              0x986c
 #define AR5K_PHY_WEAK_OFDM_LOW_THR_SELFCOR_EN   0x00000001
 #define AR5K_PHY_WEAK_OFDM_LOW_THR_M2_COUNT     0x00003f00
 #define AR5K_PHY_WEAK_OFDM_LOW_THR_M2_COUNT_S   8
@@ -2281,22 +2281,22 @@
 #define AR5K_PHY_RADAR                  0x9954
 #define AR5K_PHY_RADAR_ENABLE           0x00000001
 #define AR5K_PHY_RADAR_DISABLE          0x00000000
-#define AR5K_PHY_RADAR_INBANDTHR        0x0000003e      /* Inband threshold
+#define AR5K_PHY_RADAR_INBANDTHR        0x0000003e      /* Inband threshold
                                                         5-bits, units unknown {0..31}
                                                         (? MHz ?) */
 #define AR5K_PHY_RADAR_INBANDTHR_S      1
 
-#define AR5K_PHY_RADAR_PRSSI_THR        0x00000fc0      /* Pulse RSSI/SNR threshold
+#define AR5K_PHY_RADAR_PRSSI_THR        0x00000fc0      /* Pulse RSSI/SNR threshold
                                                         6-bits, dBm range {0..63}
                                                         in dBm units. */
 #define AR5K_PHY_RADAR_PRSSI_THR_S      6
 
-#define AR5K_PHY_RADAR_PHEIGHT_THR      0x0003f000      /* Pulse height threshold
+#define AR5K_PHY_RADAR_PHEIGHT_THR      0x0003f000      /* Pulse height threshold
                                                         6-bits, dBm range {0..63}
                                                         in dBm units. */
 #define AR5K_PHY_RADAR_PHEIGHT_THR_S    12
 
-#define AR5K_PHY_RADAR_RSSI_THR         0x00fc0000      /* Radar RSSI/SNR threshold.
+#define AR5K_PHY_RADAR_RSSI_THR         0x00fc0000      /* Radar RSSI/SNR threshold.
                                                         6-bits, dBm range {0..63}
                                                         in dBm units. */
 #define AR5K_PHY_RADAR_RSSI_THR_S       18
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 1676a3e3dc3d..3188204d8fda 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -25,7 +25,7 @@
 
 #include <asm/unaligned.h>
 
-#include <linux/pci.h>          /* To determine if a card is pci-e */
+#include <linux/pci.h>          /* To determine if a card is pci-e */
 #include <linux/log2.h>
 #include <linux/platform_device.h>
 #include "ath5k.h"
diff --git a/drivers/net/wireless/ath/ath5k/rfbuffer.h b/drivers/net/wireless/ath/ath5k/rfbuffer.h
index 16b67e84906d..5d11c23b4297 100644
--- a/drivers/net/wireless/ath/ath5k/rfbuffer.h
+++ b/drivers/net/wireless/ath/ath5k/rfbuffer.h
@@ -254,7 +254,7 @@ static const struct ath5k_ini_rfbuffer rfb_5111[] = {
 
 /* RFX112 (Derby 1) */
 
-/* BANK 6                               len  pos col */
+/* BANK 6                               len  pos col */
 #define AR5K_RF5112_OB_2GHZ             { 3, 269, 0 }
 #define AR5K_RF5112_DB_2GHZ             { 3, 272, 0 }
 
@@ -495,7 +495,7 @@ static const struct ath5k_ini_rfbuffer rfb_5112a[] = {
 /* BANK 2                               len  pos col */
 #define AR5K_RF2413_RF_TURBO            { 1, 1,   2 }
 
-/* BANK 6                               len  pos col */
+/* BANK 6                               len  pos col */
 #define AR5K_RF2413_OB_2GHZ             { 3, 168, 0 }
 #define AR5K_RF2413_DB_2GHZ             { 3, 165, 0 }
 
diff --git a/drivers/net/wireless/ath/ath5k/rfgain.h b/drivers/net/wireless/ath/ath5k/rfgain.h
index 1354d8c392c8..70c9a45609f0 100644
--- a/drivers/net/wireless/ath/ath5k/rfgain.h
+++ b/drivers/net/wireless/ath/ath5k/rfgain.h
@@ -452,7 +452,7 @@ static const struct ath5k_ini_rfgain rfgain_2425[] = {
 
 /* Check if our current measurement is inside our
  * current variable attenuation window */
-#define AR5K_GAIN_CHECK_ADJUST(_g)              \
+#define AR5K_GAIN_CHECK_ADJUST(_g)              \
         ((_g)->g_current <= (_g)->g_low || (_g)->g_current >= (_g)->g_high)
 
 struct ath5k_gain_opt_step {
diff --git a/drivers/net/wireless/ath/ath5k/sysfs.c b/drivers/net/wireless/ath/ath5k/sysfs.c
index 929c68cdf8ab..1090bbab9459 100644
--- a/drivers/net/wireless/ath/ath5k/sysfs.c
+++ b/drivers/net/wireless/ath/ath5k/sysfs.c
@@ -11,7 +11,7 @@ static ssize_t ath5k_attr_show_##name(struct device *dev,		\
                         char *buf)                                      \
 {                                                                       \
         struct ath5k_softc *sc = dev_get_drvdata(dev);                  \
-        return snprintf(buf, PAGE_SIZE, "%d\n", get);                   \
+        return snprintf(buf, PAGE_SIZE, "%d\n", get);                   \
 }                                                                       \
                                                                         \
 static ssize_t ath5k_attr_store_##name(struct device *dev,              \
@@ -34,7 +34,7 @@ static ssize_t ath5k_attr_show_##name(struct device *dev,		\
                         char *buf)                                      \
 {                                                                       \
         struct ath5k_softc *sc = dev_get_drvdata(dev);                  \
-        return snprintf(buf, PAGE_SIZE, "%d\n", get);                   \
+        return snprintf(buf, PAGE_SIZE, "%d\n", get);                   \
 }                                                                       \
 static DEVICE_ATTR(name, S_IRUGO, ath5k_attr_show_##name, NULL)