diff options
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_4k.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_def.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/carl9170/cmd.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/carl9170/rx.c | 4 |
5 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index b5c8450e1b9f..2588848f4a82 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
@@ -3178,7 +3178,7 @@ static int ar9300_compress_decision(struct ath_hw *ah, | |||
3178 | mdata_size, length); | 3178 | mdata_size, length); |
3179 | return -1; | 3179 | return -1; |
3180 | } | 3180 | } |
3181 | memcpy(mptr, (u8 *) (word + COMP_HDR_LEN), length); | 3181 | memcpy(mptr, word + COMP_HDR_LEN, length); |
3182 | ath_dbg(common, EEPROM, | 3182 | ath_dbg(common, EEPROM, |
3183 | "restored eeprom %d: uncompressed, length %d\n", | 3183 | "restored eeprom %d: uncompressed, length %d\n", |
3184 | it, length); | 3184 | it, length); |
@@ -3199,7 +3199,7 @@ static int ar9300_compress_decision(struct ath_hw *ah, | |||
3199 | "restore eeprom %d: block, reference %d, length %d\n", | 3199 | "restore eeprom %d: block, reference %d, length %d\n", |
3200 | it, reference, length); | 3200 | it, reference, length); |
3201 | ar9300_uncompress_block(ah, mptr, mdata_size, | 3201 | ar9300_uncompress_block(ah, mptr, mdata_size, |
3202 | (u8 *) (word + COMP_HDR_LEN), length); | 3202 | (word + COMP_HDR_LEN), length); |
3203 | break; | 3203 | break; |
3204 | default: | 3204 | default: |
3205 | ath_dbg(common, EEPROM, "unknown compression code %d\n", code); | 3205 | ath_dbg(common, EEPROM, "unknown compression code %d\n", code); |
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c index a850f44fa767..7d075105a85d 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c | |||
@@ -188,8 +188,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah) | |||
188 | { | 188 | { |
189 | #define EEPROM_4K_SIZE (sizeof(struct ar5416_eeprom_4k) / sizeof(u16)) | 189 | #define EEPROM_4K_SIZE (sizeof(struct ar5416_eeprom_4k) / sizeof(u16)) |
190 | struct ath_common *common = ath9k_hw_common(ah); | 190 | struct ath_common *common = ath9k_hw_common(ah); |
191 | struct ar5416_eeprom_4k *eep = | 191 | struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k; |
192 | (struct ar5416_eeprom_4k *) &ah->eeprom.map4k; | ||
193 | u16 *eepdata, temp, magic, magic2; | 192 | u16 *eepdata, temp, magic, magic2; |
194 | u32 sum = 0, el; | 193 | u32 sum = 0, el; |
195 | bool need_swap = false; | 194 | bool need_swap = false; |
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c index 56290f318520..a8ac30a00720 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_def.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c | |||
@@ -264,8 +264,7 @@ static u32 ath9k_hw_def_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr, | |||
264 | 264 | ||
265 | static int ath9k_hw_def_check_eeprom(struct ath_hw *ah) | 265 | static int ath9k_hw_def_check_eeprom(struct ath_hw *ah) |
266 | { | 266 | { |
267 | struct ar5416_eeprom_def *eep = | 267 | struct ar5416_eeprom_def *eep = &ah->eeprom.def; |
268 | (struct ar5416_eeprom_def *) &ah->eeprom.def; | ||
269 | struct ath_common *common = ath9k_hw_common(ah); | 268 | struct ath_common *common = ath9k_hw_common(ah); |
270 | u16 *eepdata, temp, magic, magic2; | 269 | u16 *eepdata, temp, magic, magic2; |
271 | u32 sum = 0, el; | 270 | u32 sum = 0, el; |
diff --git a/drivers/net/wireless/ath/carl9170/cmd.c b/drivers/net/wireless/ath/carl9170/cmd.c index 195dc6538110..39a63874b275 100644 --- a/drivers/net/wireless/ath/carl9170/cmd.c +++ b/drivers/net/wireless/ath/carl9170/cmd.c | |||
@@ -138,7 +138,7 @@ int carl9170_reboot(struct ar9170 *ar) | |||
138 | if (!cmd) | 138 | if (!cmd) |
139 | return -ENOMEM; | 139 | return -ENOMEM; |
140 | 140 | ||
141 | err = __carl9170_exec_cmd(ar, (struct carl9170_cmd *)cmd, true); | 141 | err = __carl9170_exec_cmd(ar, cmd, true); |
142 | return err; | 142 | return err; |
143 | } | 143 | } |
144 | 144 | ||
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c index 25910a14e79c..6f6a34155667 100644 --- a/drivers/net/wireless/ath/carl9170/rx.c +++ b/drivers/net/wireless/ath/carl9170/rx.c | |||
@@ -161,7 +161,7 @@ static void carl9170_cmd_callback(struct ar9170 *ar, u32 len, void *buffer) | |||
161 | 161 | ||
162 | void carl9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len) | 162 | void carl9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len) |
163 | { | 163 | { |
164 | struct carl9170_rsp *cmd = (void *) buf; | 164 | struct carl9170_rsp *cmd = buf; |
165 | struct ieee80211_vif *vif; | 165 | struct ieee80211_vif *vif; |
166 | 166 | ||
167 | if (carl9170_check_sequence(ar, cmd->hdr.seq)) | 167 | if (carl9170_check_sequence(ar, cmd->hdr.seq)) |
@@ -520,7 +520,7 @@ static u8 *carl9170_find_ie(u8 *data, unsigned int len, u8 ie) | |||
520 | */ | 520 | */ |
521 | static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len) | 521 | static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len) |
522 | { | 522 | { |
523 | struct ieee80211_hdr *hdr = (void *) data; | 523 | struct ieee80211_hdr *hdr = data; |
524 | struct ieee80211_tim_ie *tim_ie; | 524 | struct ieee80211_tim_ie *tim_ie; |
525 | u8 *tim; | 525 | u8 *tim; |
526 | u8 tim_len; | 526 | u8 tim_len; |