530-ath9k_remove_calinitdata.patch 2.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475
  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. static void ar9002_hw_init_cal_settings(struct ath_hw *ah)
  27. {
  28. @@ -973,16 +961,12 @@ static void ar9002_hw_init_cal_settings(
  29. &adc_gain_cal_single_sample;
  30. ah->adcdc_caldata.calData =
  31. &adc_dc_cal_single_sample;
  32. - ah->adcdc_calinitdata.calData =
  33. - &adc_init_dc_cal;
  34. } else {
  35. ah->iq_caldata.calData = &iq_cal_multi_sample;
  36. ah->adcgain_caldata.calData =
  37. &adc_gain_cal_multi_sample;
  38. ah->adcdc_caldata.calData =
  39. &adc_dc_cal_multi_sample;
  40. - ah->adcdc_calinitdata.calData =
  41. - &adc_init_dc_cal;
  42. }
  43. ah->supp_cals = ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL;
  44. }
  45. --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
  46. +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
  47. @@ -50,7 +50,6 @@ static void ar9003_hw_setup_calibration(
  48. ath_print(common, ATH_DBG_CALIBRATE,
  49. "starting Temperature Compensation Calibration\n");
  50. break;
  51. - case ADC_DC_INIT_CAL:
  52. case ADC_GAIN_CAL:
  53. case ADC_DC_CAL:
  54. /* Not yet */
  55. --- a/drivers/net/wireless/ath/ath9k/calib.h
  56. +++ b/drivers/net/wireless/ath/ath9k/calib.h
  57. @@ -59,7 +59,6 @@ struct ar5416IniArray {
  58. } while (0)
  59. enum ath9k_cal_types {
  60. - ADC_DC_INIT_CAL = 0x1,
  61. ADC_GAIN_CAL = 0x2,
  62. ADC_DC_CAL = 0x4,
  63. IQ_MISMATCH_CAL = 0x8,
  64. --- a/drivers/net/wireless/ath/ath9k/hw.h
  65. +++ b/drivers/net/wireless/ath/ath9k/hw.h
  66. @@ -692,7 +692,6 @@ struct ath_hw {
  67. enum ath9k_cal_types supp_cals;
  68. struct ath9k_cal_list iq_caldata;
  69. struct ath9k_cal_list adcgain_caldata;
  70. - struct ath9k_cal_list adcdc_calinitdata;
  71. struct ath9k_cal_list adcdc_caldata;
  72. struct ath9k_cal_list tempCompCalData;
  73. struct ath9k_cal_list *cal_list;