diff options
author | Mohammed Shafi Shajakhan <mshajakhan@atheros.com> | 2011-05-19 05:35:46 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-01 15:11:00 -0400 |
commit | e62ddec94a1e11ab1043b607e20ae0d142069132 (patch) | |
tree | 4ef6b8c3773adcec03849ff0944f0d537abcb4b2 /drivers | |
parent | 7882513bacb176ab4aacceefdd035ca9479da4fb (diff) |
ath9k: remove redundant if check
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 2ca351fe6d3..3a6bed0f00b 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -515,24 +515,19 @@ void ath_ani_calibrate(unsigned long data) | |||
515 | common->ani.checkani_timer = timestamp; | 515 | common->ani.checkani_timer = timestamp; |
516 | } | 516 | } |
517 | 517 | ||
518 | /* Skip all processing if there's nothing to do. */ | 518 | /* Call ANI routine if necessary */ |
519 | if (longcal || shortcal || aniflag) { | 519 | if (aniflag) { |
520 | /* Call ANI routine if necessary */ | 520 | spin_lock_irqsave(&common->cc_lock, flags); |
521 | if (aniflag) { | 521 | ath9k_hw_ani_monitor(ah, ah->curchan); |
522 | spin_lock_irqsave(&common->cc_lock, flags); | 522 | ath_update_survey_stats(sc); |
523 | ath9k_hw_ani_monitor(ah, ah->curchan); | 523 | spin_unlock_irqrestore(&common->cc_lock, flags); |
524 | ath_update_survey_stats(sc); | 524 | } |
525 | spin_unlock_irqrestore(&common->cc_lock, flags); | ||
526 | } | ||
527 | 525 | ||
528 | /* Perform calibration if necessary */ | 526 | /* Perform calibration if necessary */ |
529 | if (longcal || shortcal) { | 527 | if (longcal || shortcal) { |
530 | common->ani.caldone = | 528 | common->ani.caldone = |
531 | ath9k_hw_calibrate(ah, | 529 | ath9k_hw_calibrate(ah, ah->curchan, |
532 | ah->curchan, | 530 | common->rx_chainmask, longcal); |
533 | common->rx_chainmask, | ||
534 | longcal); | ||
535 | } | ||
536 | } | 531 | } |
537 | 532 | ||
538 | ath9k_ps_restore(sc); | 533 | ath9k_ps_restore(sc); |