aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/iwl-4965.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-08-26 04:45:16 -0400
committerStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 05:23:08 -0500
commit232913b51e6f6e7105184b23a436dfc6b942491b (patch)
tree7411b528ab8e501ce3ab3e3f903d60ea98c7a14f /drivers/net/wireless/iwlegacy/iwl-4965.c
parentdb54eb57ce5edeebd621b12e23f3e1cdea7fe3ee (diff)
iwlegacy: remove not needed parentheses
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-4965.c')
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965.c b/drivers/net/wireless/iwlegacy/iwl-4965.c
index a7450323a66..3706e47ce27 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965.c
@@ -284,8 +284,8 @@ static bool iw4965_is_ht40_channel(__le32 rxon_flags)
284{ 284{
285 int chan_mod = le32_to_cpu(rxon_flags & RXON_FLG_CHANNEL_MODE_MSK) 285 int chan_mod = le32_to_cpu(rxon_flags & RXON_FLG_CHANNEL_MODE_MSK)
286 >> RXON_FLG_CHANNEL_MODE_POS; 286 >> RXON_FLG_CHANNEL_MODE_POS;
287 return ((chan_mod == CHANNEL_MODE_PURE_40) || 287 return (chan_mod == CHANNEL_MODE_PURE_40 ||
288 (chan_mod == CHANNEL_MODE_MIXED)); 288 chan_mod == CHANNEL_MODE_MIXED);
289} 289}
290 290
291static void il4965_nic_config(struct il_priv *il) 291static void il4965_nic_config(struct il_priv *il)
@@ -323,7 +323,7 @@ static void il4965_chain_noise_reset(struct il_priv *il)
323{ 323{
324 struct il_chain_noise_data *data = &(il->chain_noise_data); 324 struct il_chain_noise_data *data = &(il->chain_noise_data);
325 325
326 if ((data->state == IL_CHAIN_NOISE_ALIVE) && 326 if (data->state == IL_CHAIN_NOISE_ALIVE &&
327 il_is_any_associated(il)) { 327 il_is_any_associated(il)) {
328 struct il_calib_diff_gain_cmd cmd; 328 struct il_calib_diff_gain_cmd cmd;
329 329
@@ -458,8 +458,8 @@ static s32 il4965_get_voltage_compensation(s32 eeprom_voltage,
458{ 458{
459 s32 comp = 0; 459 s32 comp = 0;
460 460
461 if ((TX_POWER_IL_ILLEGAL_VOLTAGE == eeprom_voltage) || 461 if (TX_POWER_IL_ILLEGAL_VOLTAGE == eeprom_voltage ||
462 (TX_POWER_IL_ILLEGAL_VOLTAGE == current_voltage)) 462 TX_POWER_IL_ILLEGAL_VOLTAGE == current_voltage)
463 return 0; 463 return 0;
464 464
465 il4965_math_div_round(current_voltage - eeprom_voltage, 465 il4965_math_div_round(current_voltage - eeprom_voltage,
@@ -506,8 +506,8 @@ static u32 il4965_get_sub_band(const struct il_priv *il, u32 channel)
506 if (il->calib_info->band_info[b].ch_from == 0) 506 if (il->calib_info->band_info[b].ch_from == 0)
507 continue; 507 continue;
508 508
509 if ((channel >= il->calib_info->band_info[b].ch_from) 509 if (channel >= il->calib_info->band_info[b].ch_from &&
510 && (channel <= il->calib_info->band_info[b].ch_to)) 510 channel <= il->calib_info->band_info[b].ch_to)
511 break; 511 break;
512 } 512 }
513 513
@@ -1158,15 +1158,15 @@ static int il4965_send_rxon_assoc(struct il_priv *il,
1158 const struct il_rxon_cmd *rxon1 = &ctx->staging; 1158 const struct il_rxon_cmd *rxon1 = &ctx->staging;
1159 const struct il_rxon_cmd *rxon2 = &ctx->active; 1159 const struct il_rxon_cmd *rxon2 = &ctx->active;
1160 1160
1161 if ((rxon1->flags == rxon2->flags) && 1161 if (rxon1->flags == rxon2->flags &&
1162 (rxon1->filter_flags == rxon2->filter_flags) && 1162 rxon1->filter_flags == rxon2->filter_flags &&
1163 (rxon1->cck_basic_rates == rxon2->cck_basic_rates) && 1163 rxon1->cck_basic_rates == rxon2->cck_basic_rates &&
1164 (rxon1->ofdm_ht_single_stream_basic_rates == 1164 rxon1->ofdm_ht_single_stream_basic_rates ==
1165 rxon2->ofdm_ht_single_stream_basic_rates) && 1165 rxon2->ofdm_ht_single_stream_basic_rates &&
1166 (rxon1->ofdm_ht_dual_stream_basic_rates == 1166 rxon1->ofdm_ht_dual_stream_basic_rates ==
1167 rxon2->ofdm_ht_dual_stream_basic_rates) && 1167 rxon2->ofdm_ht_dual_stream_basic_rates &&
1168 (rxon1->rx_chain == rxon2->rx_chain) && 1168 rxon1->rx_chain == rxon2->rx_chain &&
1169 (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) { 1169 rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates) {
1170 D_INFO("Using current RXON_ASSOC. Not resending.\n"); 1170 D_INFO("Using current RXON_ASSOC. Not resending.\n");
1171 return 0; 1171 return 0;
1172 } 1172 }
@@ -1216,7 +1216,7 @@ static int il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1216 * abort any previous channel switch if still in process 1216 * abort any previous channel switch if still in process
1217 */ 1217 */
1218 if (test_bit(STATUS_CHANNEL_SWITCH_PENDING, &il->status) && 1218 if (test_bit(STATUS_CHANNEL_SWITCH_PENDING, &il->status) &&
1219 (il->switch_channel != ctx->staging.channel)) { 1219 il->switch_channel != ctx->staging.channel) {
1220 D_11H("abort channel switch on %d\n", 1220 D_11H("abort channel switch on %d\n",
1221 le16_to_cpu(il->switch_channel)); 1221 le16_to_cpu(il->switch_channel));
1222 il_chswitch_done(il, false); 1222 il_chswitch_done(il, false);
@@ -1366,7 +1366,7 @@ static int il4965_hw_channel_switch(struct il_priv *il,
1366 * calculate the ucode channel switch time 1366 * calculate the ucode channel switch time
1367 * adding TSF as one of the factor for when to switch 1367 * adding TSF as one of the factor for when to switch
1368 */ 1368 */
1369 if ((il->ucode_beacon_time > tsf_low) && beacon_interval) { 1369 if (il->ucode_beacon_time > tsf_low && beacon_interval) {
1370 if (switch_count > ((il->ucode_beacon_time - tsf_low) / 1370 if (switch_count > ((il->ucode_beacon_time - tsf_low) /
1371 beacon_interval)) { 1371 beacon_interval)) {
1372 switch_count -= (il->ucode_beacon_time - 1372 switch_count -= (il->ucode_beacon_time -
@@ -1789,7 +1789,7 @@ static void il4965_rx_reply_tx(struct il_priv *il,
1789 u8 *qc = NULL; 1789 u8 *qc = NULL;
1790 unsigned long flags; 1790 unsigned long flags;
1791 1791
1792 if ((index >= txq->q.n_bd) || (il_queue_used(&txq->q, index) == 0)) { 1792 if (index >= txq->q.n_bd || il_queue_used(&txq->q, index) == 0) {
1793 IL_ERR("Read index for DMA queue txq_id (%d) index %d " 1793 IL_ERR("Read index for DMA queue txq_id (%d) index %d "
1794 "is out of range [0-%d] %d %d\n", txq_id, 1794 "is out of range [0-%d] %d %d\n", txq_id,
1795 index, txq->q.n_bd, txq->q.write_ptr, 1795 index, txq->q.n_bd, txq->q.write_ptr,
@@ -1838,8 +1838,8 @@ static void il4965_rx_reply_tx(struct il_priv *il,
1838 tid, freed); 1838 tid, freed);
1839 1839
1840 if (il->mac80211_registered && 1840 if (il->mac80211_registered &&
1841 (il_queue_space(&txq->q) > txq->q.low_mark) 1841 il_queue_space(&txq->q) > txq->q.low_mark &&
1842 && (agg->state != IL_EMPTYING_HW_QUEUE_DELBA)) 1842 agg->state != IL_EMPTYING_HW_QUEUE_DELBA)
1843 il_wake_queue(il, txq); 1843 il_wake_queue(il, txq);
1844 } 1844 }
1845 } else { 1845 } else {
@@ -1863,7 +1863,7 @@ static void il4965_rx_reply_tx(struct il_priv *il,
1863 D_TX_REPLY("Station not known\n"); 1863 D_TX_REPLY("Station not known\n");
1864 1864
1865 if (il->mac80211_registered && 1865 if (il->mac80211_registered &&
1866 (il_queue_space(&txq->q) > txq->q.low_mark)) 1866 il_queue_space(&txq->q) > txq->q.low_mark)
1867 il_wake_queue(il, txq); 1867 il_wake_queue(il, txq);
1868 } 1868 }
1869 if (qc && likely(sta_id != IL_INVALID_STATION)) 1869 if (qc && likely(sta_id != IL_INVALID_STATION))