aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-09-30 19:46:13 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-10-05 13:35:23 -0400
commit9094a086f24bfb1d1f244883020c4d9453ffc0b6 (patch)
tree531348d4573d737488e72026b41b35e1ae964295 /drivers/net/wireless/ath
parentf209f5298217cf54cd5a9163e18b08d093faf8d9 (diff)
ath9k_hw: remove some useless calibration data
The percal struct and bitmask for the initial DC calibration are not used anywhere, so they can be removed. Signed-off-by: Felix Fietkau <nbd@openwrt.org Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9002_calib.c16
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9003_calib.c1
-rw-r--r--drivers/net/wireless/ath/ath9k/calib.h1
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.h1
4 files changed, 0 insertions, 19 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index d7d1d55362e6..f2da119bbf02 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -45,11 +45,6 @@ static void ar9002_hw_setup_calibration(struct ath_hw *ah,
45 ath_print(common, ATH_DBG_CALIBRATE, 45 ath_print(common, ATH_DBG_CALIBRATE,
46 "starting ADC DC Calibration\n"); 46 "starting ADC DC Calibration\n");
47 break; 47 break;
48 case ADC_DC_INIT_CAL:
49 REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_ADC_DC_INIT);
50 ath_print(common, ATH_DBG_CALIBRATE,
51 "starting Init ADC DC Calibration\n");
52 break;
53 case TEMP_COMP_CAL: 48 case TEMP_COMP_CAL:
54 break; /* Not supported */ 49 break; /* Not supported */
55 } 50 }
@@ -950,13 +945,6 @@ static const struct ath9k_percal_data adc_dc_cal_single_sample = {
950 ar9002_hw_adc_dccal_collect, 945 ar9002_hw_adc_dccal_collect,
951 ar9002_hw_adc_dccal_calibrate 946 ar9002_hw_adc_dccal_calibrate
952}; 947};
953static const struct ath9k_percal_data adc_init_dc_cal = {
954 ADC_DC_INIT_CAL,
955 MIN_CAL_SAMPLES,
956 INIT_LOG_COUNT,
957 ar9002_hw_adc_dccal_collect,
958 ar9002_hw_adc_dccal_calibrate
959};
960 948
961static void ar9002_hw_init_cal_settings(struct ath_hw *ah) 949static void ar9002_hw_init_cal_settings(struct ath_hw *ah)
962{ 950{
@@ -973,16 +961,12 @@ static void ar9002_hw_init_cal_settings(struct ath_hw *ah)
973 &adc_gain_cal_single_sample; 961 &adc_gain_cal_single_sample;
974 ah->adcdc_caldata.calData = 962 ah->adcdc_caldata.calData =
975 &adc_dc_cal_single_sample; 963 &adc_dc_cal_single_sample;
976 ah->adcdc_calinitdata.calData =
977 &adc_init_dc_cal;
978 } else { 964 } else {
979 ah->iq_caldata.calData = &iq_cal_multi_sample; 965 ah->iq_caldata.calData = &iq_cal_multi_sample;
980 ah->adcgain_caldata.calData = 966 ah->adcgain_caldata.calData =
981 &adc_gain_cal_multi_sample; 967 &adc_gain_cal_multi_sample;
982 ah->adcdc_caldata.calData = 968 ah->adcdc_caldata.calData =
983 &adc_dc_cal_multi_sample; 969 &adc_dc_cal_multi_sample;
984 ah->adcdc_calinitdata.calData =
985 &adc_init_dc_cal;
986 } 970 }
987 ah->supp_cals = ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL; 971 ah->supp_cals = ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL;
988 } 972 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 4674ea8c9c99..b41f5cda824b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -50,7 +50,6 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah,
50 ath_print(common, ATH_DBG_CALIBRATE, 50 ath_print(common, ATH_DBG_CALIBRATE,
51 "starting Temperature Compensation Calibration\n"); 51 "starting Temperature Compensation Calibration\n");
52 break; 52 break;
53 case ADC_DC_INIT_CAL:
54 case ADC_GAIN_CAL: 53 case ADC_GAIN_CAL:
55 case ADC_DC_CAL: 54 case ADC_DC_CAL:
56 /* Not yet */ 55 /* Not yet */
diff --git a/drivers/net/wireless/ath/ath9k/calib.h b/drivers/net/wireless/ath/ath9k/calib.h
index 5b053a6260b2..1fa56c91a894 100644
--- a/drivers/net/wireless/ath/ath9k/calib.h
+++ b/drivers/net/wireless/ath/ath9k/calib.h
@@ -59,7 +59,6 @@ struct ar5416IniArray {
59 } while (0) 59 } while (0)
60 60
61enum ath9k_cal_types { 61enum ath9k_cal_types {
62 ADC_DC_INIT_CAL = 0x1,
63 ADC_GAIN_CAL = 0x2, 62 ADC_GAIN_CAL = 0x2,
64 ADC_DC_CAL = 0x4, 63 ADC_DC_CAL = 0x4,
65 IQ_MISMATCH_CAL = 0x8, 64 IQ_MISMATCH_CAL = 0x8,
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 1b6739bd93ff..235cb5357a22 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -692,7 +692,6 @@ struct ath_hw {
692 enum ath9k_cal_types supp_cals; 692 enum ath9k_cal_types supp_cals;
693 struct ath9k_cal_list iq_caldata; 693 struct ath9k_cal_list iq_caldata;
694 struct ath9k_cal_list adcgain_caldata; 694 struct ath9k_cal_list adcgain_caldata;
695 struct ath9k_cal_list adcdc_calinitdata;
696 struct ath9k_cal_list adcdc_caldata; 695 struct ath9k_cal_list adcdc_caldata;
697 struct ath9k_cal_list tempCompCalData; 696 struct ath9k_cal_list tempCompCalData;
698 struct ath9k_cal_list *cal_list; 697 struct ath9k_cal_list *cal_list;