ath9k_hw: Remove TEMP_COMP_CAL

This is not enabled for any chip and is unused.

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

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 598b847e4e5abf42e0fcfc122eee68ff66ca8537..a562a5d47eab877ead64d2cbfefb6f5a9649eca9 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -32,7 +32,6 @@ struct coeff {
 
 enum ar9003_cal_types {
        IQ_MISMATCH_CAL = BIT(0),
-       TEMP_COMP_CAL = BIT(1),
 };
 
 static void ar9003_hw_setup_calibration(struct ath_hw *ah,
@@ -49,7 +48,7 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah,
                 */
                REG_RMW_FIELD(ah, AR_PHY_TIMING4,
                              AR_PHY_TIMING4_IQCAL_LOG_COUNT_MAX,
-               currCal->calData->calCountMax);
+                             currCal->calData->calCountMax);
                REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_IQ);
 
                ath_dbg(common, CALIBRATE,
@@ -58,14 +57,8 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah,
                /* Kick-off cal */
                REG_SET_BIT(ah, AR_PHY_TIMING4, AR_PHY_TIMING4_DO_CAL);
                break;
-       case TEMP_COMP_CAL:
-               REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_THERM,
-                             AR_PHY_65NM_CH0_THERM_LOCAL, 1);
-               REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_THERM,
-                             AR_PHY_65NM_CH0_THERM_START, 1);
-
-               ath_dbg(common, CALIBRATE,
-                       "starting Temperature Compensation Calibration\n");
+       default:
+               ath_err(common, "Invalid calibration type\n");
                break;
        }
 }
@@ -1144,13 +1137,6 @@ skip_tx_iqcal:
        INSERT_CAL(ah, &ah->iq_caldata);
        ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n");
 
-       if (ah->supp_cals & TEMP_COMP_CAL) {
-               INIT_CAL(&ah->tempCompCalData);
-               INSERT_CAL(ah, &ah->tempCompCalData);
-               ath_dbg(common, CALIBRATE,
-                       "enabling Temperature Compensation Calibration\n");
-       }
-
        /* Initialize current pointer to first element in list */
        ah->cal_list_curr = ah->cal_list;
 

diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index d2b5229474b6f9cf1625f1a2fbf90fd823c1d860..38c5a8702fb2006ba69835c348a4d0643f7c77c8 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -768,7 +768,6 @@ struct ath_hw {
        struct ath9k_cal_list iq_caldata;
        struct ath9k_cal_list adcgain_caldata;
        struct ath9k_cal_list adcdc_caldata;
-       struct ath9k_cal_list tempCompCalData;
        struct ath9k_cal_list *cal_list;
        struct ath9k_cal_list *cal_list_last;
        struct ath9k_cal_list *cal_list_curr;