Skip to content

Commit

Permalink
iwlagn: remove old EEPROM TX power reading
Browse files Browse the repository at this point in the history
This removes the old TX power reading code, it isn't
necessary since the new code is able to read all the
various EEPROM layouts due to relying on information
contained in the EEPROM.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
  • Loading branch information
Johannes Berg authored and Wey-Yi Guy committed Dec 13, 2010
1 parent 8d6748c commit c6fc108
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 331 deletions.
2 changes: 0 additions & 2 deletions drivers/net/wireless/iwlwifi/iwl-1000.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@ struct iwl_cfg iwl100_bgn_cfg = {
.ht_params = &iwl1000_ht_params,
.led_mode = IWL_LED_RF_STATE,
.rx_with_siso_diversity = true,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl100_bg_cfg = {
Expand All @@ -331,7 +330,6 @@ struct iwl_cfg iwl100_bg_cfg = {
.base_params = &iwl1000_base_params,
.led_mode = IWL_LED_RF_STATE,
.rx_with_siso_diversity = true,
.use_new_eeprom_reading = true,
};

MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));
Expand Down
12 changes: 0 additions & 12 deletions drivers/net/wireless/iwlwifi/iwl-6000.c
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,6 @@ struct iwl_cfg iwl6005_2agn_cfg = {
.need_dc_calib = true,
.need_temp_offset_calib = true,
.led_mode = IWL_LED_RF_STATE,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl6005_2abg_cfg = {
Expand All @@ -584,7 +583,6 @@ struct iwl_cfg iwl6005_2abg_cfg = {
.need_dc_calib = true,
.need_temp_offset_calib = true,
.led_mode = IWL_LED_RF_STATE,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl6005_2bg_cfg = {
Expand All @@ -600,7 +598,6 @@ struct iwl_cfg iwl6005_2bg_cfg = {
.need_dc_calib = true,
.need_temp_offset_calib = true,
.led_mode = IWL_LED_RF_STATE,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl6030_2agn_cfg = {
Expand All @@ -621,7 +618,6 @@ struct iwl_cfg iwl6030_2agn_cfg = {
.adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl6030_2abg_cfg = {
Expand All @@ -641,7 +637,6 @@ struct iwl_cfg iwl6030_2abg_cfg = {
.adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl6030_2bgn_cfg = {
Expand All @@ -662,7 +657,6 @@ struct iwl_cfg iwl6030_2bgn_cfg = {
.adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl6030_2bg_cfg = {
Expand All @@ -682,7 +676,6 @@ struct iwl_cfg iwl6030_2bg_cfg = {
.adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl1030_bgn_cfg = {
Expand All @@ -703,7 +696,6 @@ struct iwl_cfg iwl1030_bgn_cfg = {
.adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl1030_bg_cfg = {
Expand All @@ -723,7 +715,6 @@ struct iwl_cfg iwl1030_bg_cfg = {
.adv_pm = true,
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
.use_new_eeprom_reading = true,
};

/*
Expand Down Expand Up @@ -806,7 +797,6 @@ struct iwl_cfg iwl6150_bgn_cfg = {
.ht_params = &iwl6000_ht_params,
.need_dc_calib = true,
.led_mode = IWL_LED_RF_STATE,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl6050_2abg_cfg = {
Expand Down Expand Up @@ -856,7 +846,6 @@ struct iwl_cfg iwl130_bgn_cfg = {
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
.rx_with_siso_diversity = true,
.use_new_eeprom_reading = true,
};

struct iwl_cfg iwl130_bg_cfg = {
Expand All @@ -876,7 +865,6 @@ struct iwl_cfg iwl130_bg_cfg = {
/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
.rx_with_siso_diversity = true,
.use_new_eeprom_reading = true,
};

MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
Expand Down
Loading

0 comments on commit c6fc108

Please sign in to comment.