ath9k: Cleanup calibration interface

This patch cleans up the functions dealing with calibration,
using proper return values.
ath9k_hw_per_calibration(), ath9k_hw_calibrate now return bool values
instead of setting error values in the function arguments.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 10 insertions, 22 deletions

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 9564b73ded51..8bf2bf36fd6d 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -367,28 +367,16 @@ static void ath_ani_calibrate(unsigned long data)
 
                 /* Perform calibration if necessary */
                 if (longcal || shortcal) {
-                        bool iscaldone = false;
-
-                        if (ath9k_hw_calibrate(ah, ah->curchan,
-                                               sc->rx_chainmask, longcal,
-                                               &iscaldone)) {
-                                if (longcal)
-                                        sc->ani.noise_floor =
-                                                ath9k_hw_getchan_noise(ah,
-                                                               ah->curchan);
-
-                                DPRINTF(sc, ATH_DBG_ANI,
-                                        "calibrate chan %u/%x nf: %d\n",
-                                        ah->curchan->channel,
-                                        ah->curchan->channelFlags,
-                                        sc->ani.noise_floor);
-                        } else {
-                                DPRINTF(sc, ATH_DBG_ANY,
-                                        "calibrate chan %u/%x failed\n",
-                                        ah->curchan->channel,
-                                        ah->curchan->channelFlags);
-                        }
-                        sc->ani.caldone = iscaldone;
+                        sc->ani.caldone = ath9k_hw_calibrate(ah, ah->curchan,
+                                                     sc->rx_chainmask, longcal);
+
+                        if (longcal)
+                                sc->ani.noise_floor = ath9k_hw_getchan_noise(ah,
+                                                                     ah->curchan);
+
+                        DPRINTF(sc, ATH_DBG_ANI," calibrate chan %u/%x nf: %d\n",
+                                ah->curchan->channel, ah->curchan->channelFlags,
+                                sc->ani.noise_floor);
                 }
         }