package/mac80211/patches/530-ath9k_remove_calinitdata.patch

   1 --- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
   2 +++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
   3 @@ -45,11 +45,6 @@ static void ar9002_hw_setup_calibration(
   4                 ath_print(common, ATH_DBG_CALIBRATE,
   5                           "starting ADC DC Calibration\n");
   6                 break;
   7 -       case ADC_DC_INIT_CAL:
   8 -               REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_ADC_DC_INIT);
   9 -               ath_print(common, ATH_DBG_CALIBRATE,
  10 -                         "starting Init ADC DC Calibration\n");
  11 -               break;
  12         case TEMP_COMP_CAL:
  13                 break; /* Not supported */
  14         }
  15 @@ -950,13 +945,6 @@ static const struct ath9k_percal_data ad
  16         ar9002_hw_adc_dccal_collect,
  17         ar9002_hw_adc_dccal_calibrate
  18  };
  19 -static const struct ath9k_percal_data adc_init_dc_cal = {
  20 -       ADC_DC_INIT_CAL,
  21 -       MIN_CAL_SAMPLES,
  22 -       INIT_LOG_COUNT,
  23 -       ar9002_hw_adc_dccal_collect,
  24 -       ar9002_hw_adc_dccal_calibrate
  25 -};
  26
  27  static void ar9002_hw_init_cal_settings(struct ath_hw *ah)
  28  {
  29 @@ -973,16 +961,12 @@ static void ar9002_hw_init_cal_settings(
  30                                 &adc_gain_cal_single_sample;
  31                         ah->adcdc_caldata.calData =
  32                                 &adc_dc_cal_single_sample;
  33 -                       ah->adcdc_calinitdata.calData =
  34 -                               &adc_init_dc_cal;
  35                 } else {
  36                         ah->iq_caldata.calData = &iq_cal_multi_sample;
  37                         ah->adcgain_caldata.calData =
  38                                 &adc_gain_cal_multi_sample;
  39                         ah->adcdc_caldata.calData =
  40                                 &adc_dc_cal_multi_sample;
  41 -                       ah->adcdc_calinitdata.calData =
  42 -                               &adc_init_dc_cal;
  43                 }
  44                 ah->supp_cals = ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL;
  45         }
  46 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
  47 +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
  48 @@ -50,7 +50,6 @@ static void ar9003_hw_setup_calibration(
  49                 ath_print(common, ATH_DBG_CALIBRATE,
  50                           "starting Temperature Compensation Calibration\n");
  51                 break;
  52 -       case ADC_DC_INIT_CAL:
  53         case ADC_GAIN_CAL:
  54         case ADC_DC_CAL:
  55                 /* Not yet */
  56 --- a/drivers/net/wireless/ath/ath9k/calib.h
  57 +++ b/drivers/net/wireless/ath/ath9k/calib.h
  58 @@ -59,7 +59,6 @@ struct ar5416IniArray {
  59         } while (0)
  60
  61  enum ath9k_cal_types {
  62 -       ADC_DC_INIT_CAL = 0x1,
  63         ADC_GAIN_CAL = 0x2,
  64         ADC_DC_CAL = 0x4,
  65         IQ_MISMATCH_CAL = 0x8,
  66 --- a/drivers/net/wireless/ath/ath9k/hw.h
  67 +++ b/drivers/net/wireless/ath/ath9k/hw.h
  68 @@ -692,7 +692,6 @@ struct ath_hw {
  69         enum ath9k_cal_types supp_cals;
  70         struct ath9k_cal_list iq_caldata;
  71         struct ath9k_cal_list adcgain_caldata;
  72 -       struct ath9k_cal_list adcdc_calinitdata;
  73         struct ath9k_cal_list adcdc_caldata;
  74         struct ath9k_cal_list tempCompCalData;
  75         struct ath9k_cal_list *cal_list;