Commit d2c7f773 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

ath5k: fix misplaced or extraneous braces found by checkpatch.pl


Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 633d006e
...@@ -1011,8 +1011,7 @@ struct ath5k_capabilities { ...@@ -1011,8 +1011,7 @@ struct ath5k_capabilities {
/* size of noise floor history (keep it a power of two) */ /* size of noise floor history (keep it a power of two) */
#define ATH5K_NF_CAL_HIST_MAX 8 #define ATH5K_NF_CAL_HIST_MAX 8
struct ath5k_nfcal_hist struct ath5k_nfcal_hist {
{
s16 index; /* current index into nfval */ s16 index; /* current index into nfval */
s16 nfval[ATH5K_NF_CAL_HIST_MAX]; /* last few noise floors */ s16 nfval[ATH5K_NF_CAL_HIST_MAX]; /* last few noise floors */
}; };
......
...@@ -1265,12 +1265,11 @@ static int ath5k_common_padpos(struct sk_buff *skb) ...@@ -1265,12 +1265,11 @@ static int ath5k_common_padpos(struct sk_buff *skb)
__le16 frame_control = hdr->frame_control; __le16 frame_control = hdr->frame_control;
int padpos = 24; int padpos = 24;
if (ieee80211_has_a4(frame_control)) { if (ieee80211_has_a4(frame_control))
padpos += ETH_ALEN; padpos += ETH_ALEN;
}
if (ieee80211_is_data_qos(frame_control)) { if (ieee80211_is_data_qos(frame_control))
padpos += IEEE80211_QOS_CTL_LEN; padpos += IEEE80211_QOS_CTL_LEN;
}
return padpos; return padpos;
} }
...@@ -2199,13 +2198,12 @@ ath5k_intr(int irq, void *dev_id) ...@@ -2199,13 +2198,12 @@ ath5k_intr(int irq, void *dev_id)
ATH5K_DBG(sc, ATH5K_DEBUG_RESET, ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
"rx overrun, resetting\n"); "rx overrun, resetting\n");
ieee80211_queue_work(sc->hw, &sc->reset_work); ieee80211_queue_work(sc->hw, &sc->reset_work);
} } else
else
ath5k_schedule_rx(sc); ath5k_schedule_rx(sc);
} else { } else {
if (status & AR5K_INT_SWBA) { if (status & AR5K_INT_SWBA)
tasklet_hi_schedule(&sc->beacontq); tasklet_hi_schedule(&sc->beacontq);
}
if (status & AR5K_INT_RXEOL) { if (status & AR5K_INT_RXEOL) {
/* /*
* NB: the hardware should re-read the link when * NB: the hardware should re-read the link when
......
...@@ -96,8 +96,7 @@ struct ath5k_txq { ...@@ -96,8 +96,7 @@ struct ath5k_txq {
/* /*
* State for LED triggers * State for LED triggers
*/ */
struct ath5k_led struct ath5k_led {
{
char name[ATH5K_LED_MAX_NAME_LEN + 1]; /* name of the LED in sysfs */ char name[ATH5K_LED_MAX_NAME_LEN + 1]; /* name of the LED in sysfs */
struct ath5k_softc *sc; /* driver state */ struct ath5k_softc *sc; /* driver state */
struct led_classdev led_dev; /* led classdev */ struct led_classdev led_dev; /* led classdev */
......
...@@ -644,10 +644,12 @@ ath5k_eeprom_init_11bg_2413(struct ath5k_hw *ah, unsigned int mode, int offset) ...@@ -644,10 +644,12 @@ ath5k_eeprom_init_11bg_2413(struct ath5k_hw *ah, unsigned int mode, int offset)
static inline void static inline void
ath5k_get_pcdac_intercepts(struct ath5k_hw *ah, u8 min, u8 max, u8 *vp) ath5k_get_pcdac_intercepts(struct ath5k_hw *ah, u8 min, u8 max, u8 *vp)
{ {
static const u16 intercepts3[] = static const u16 intercepts3[] = {
{ 0, 5, 10, 20, 30, 50, 70, 85, 90, 95, 100 }; 0, 5, 10, 20, 30, 50, 70, 85, 90, 95, 100
static const u16 intercepts3_2[] = };
{ 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 }; static const u16 intercepts3_2[] = {
0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100
};
const u16 *ip; const u16 *ip;
int i; int i;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment