ath9k: remove redundant if check

Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Mohammed Shafi Shajakhan 2011-05-19 15:05:46 +05:30 committed by John W. Linville
parent 7882513bac
commit e62ddec94a
1 changed files with 12 additions and 17 deletions

View File

@ -515,24 +515,19 @@ void ath_ani_calibrate(unsigned long data)
common->ani.checkani_timer = timestamp; common->ani.checkani_timer = timestamp;
} }
/* Skip all processing if there's nothing to do. */ /* Call ANI routine if necessary */
if (longcal || shortcal || aniflag) { if (aniflag) {
/* Call ANI routine if necessary */ spin_lock_irqsave(&common->cc_lock, flags);
if (aniflag) { ath9k_hw_ani_monitor(ah, ah->curchan);
spin_lock_irqsave(&common->cc_lock, flags); ath_update_survey_stats(sc);
ath9k_hw_ani_monitor(ah, ah->curchan); spin_unlock_irqrestore(&common->cc_lock, flags);
ath_update_survey_stats(sc); }
spin_unlock_irqrestore(&common->cc_lock, flags);
}
/* Perform calibration if necessary */ /* Perform calibration if necessary */
if (longcal || shortcal) { if (longcal || shortcal) {
common->ani.caldone = common->ani.caldone =
ath9k_hw_calibrate(ah, ath9k_hw_calibrate(ah, ah->curchan,
ah->curchan, common->rx_chainmask, longcal);
common->rx_chainmask,
longcal);
}
} }
ath9k_ps_restore(sc); ath9k_ps_restore(sc);