diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-01 19:29:54 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-08 11:01:55 -0400 |
commit | ae89726a02049e8f61bb3c8bf5dbf1fc06527a07 (patch) | |
tree | 9dbf626a2ea21c439392b3b984c587d5d447e6ee | |
parent | 23c0fcc66b4345ea97ae588c2e01f10c994652ba (diff) |
iwlagn: tx power calib always done in firmware
Remove the config flag for tx power calib
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 1 |
4 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index cccf7471c003..bc5dfe2978f0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |||
@@ -495,8 +495,10 @@ void iwlagn_rx_handler_setup(struct iwl_priv *priv) | |||
495 | 495 | ||
496 | void iwlagn_setup_deferred_work(struct iwl_priv *priv) | 496 | void iwlagn_setup_deferred_work(struct iwl_priv *priv) |
497 | { | 497 | { |
498 | /* in agn, the tx power calibration is done in uCode */ | 498 | /* |
499 | priv->disable_tx_power_cal = 1; | 499 | * nothing need to be done here anymore |
500 | * still keep for future use if needed | ||
501 | */ | ||
500 | } | 502 | } |
501 | 503 | ||
502 | int iwlagn_hw_valid_rtc_data_addr(u32 addr) | 504 | int iwlagn_hw_valid_rtc_data_addr(u32 addr) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index a0530d03b301..98dc544f112c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -250,8 +250,6 @@ struct iwl_mod_params { | |||
250 | * @wd_timeout: TX queues watchdog timeout | 250 | * @wd_timeout: TX queues watchdog timeout |
251 | * @temperature_kelvin: temperature report by uCode in kelvin | 251 | * @temperature_kelvin: temperature report by uCode in kelvin |
252 | * @max_event_log_size: size of event log buffer size for ucode event logging | 252 | * @max_event_log_size: size of event log buffer size for ucode event logging |
253 | * @tx_power_by_driver: tx power calibration performed by driver | ||
254 | * instead of uCode | ||
255 | * @ucode_tracing: support ucode continuous tracing | 253 | * @ucode_tracing: support ucode continuous tracing |
256 | * @sensitivity_calib_by_driver: driver has the capability to perform | 254 | * @sensitivity_calib_by_driver: driver has the capability to perform |
257 | * sensitivity calibration operation | 255 | * sensitivity calibration operation |
@@ -278,7 +276,6 @@ struct iwl_base_params { | |||
278 | unsigned int wd_timeout; | 276 | unsigned int wd_timeout; |
279 | bool temperature_kelvin; | 277 | bool temperature_kelvin; |
280 | u32 max_event_log_size; | 278 | u32 max_event_log_size; |
281 | const bool tx_power_by_driver; | ||
282 | const bool ucode_tracing; | 279 | const bool ucode_tracing; |
283 | const bool sensitivity_calib_by_driver; | 280 | const bool sensitivity_calib_by_driver; |
284 | const bool chain_noise_calib_by_driver; | 281 | const bool chain_noise_calib_by_driver; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 2c58980f2d06..9b1f9621b630 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -1767,9 +1767,6 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | |||
1767 | if (priv->cfg->base_params->chain_noise_calib_by_driver) | 1767 | if (priv->cfg->base_params->chain_noise_calib_by_driver) |
1768 | DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf, | 1768 | DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf, |
1769 | &priv->disable_chain_noise_cal); | 1769 | &priv->disable_chain_noise_cal); |
1770 | if (priv->cfg->base_params->tx_power_by_driver) | ||
1771 | DEBUGFS_ADD_BOOL(disable_tx_power, dir_rf, | ||
1772 | &priv->disable_tx_power_cal); | ||
1773 | return 0; | 1770 | return 0; |
1774 | 1771 | ||
1775 | err: | 1772 | err: |
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 14f7d8fb6886..7fe68f8dd210 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -1489,7 +1489,6 @@ struct iwl_priv { | |||
1489 | struct work_struct txpower_work; | 1489 | struct work_struct txpower_work; |
1490 | u32 disable_sens_cal; | 1490 | u32 disable_sens_cal; |
1491 | u32 disable_chain_noise_cal; | 1491 | u32 disable_chain_noise_cal; |
1492 | u32 disable_tx_power_cal; | ||
1493 | struct work_struct run_time_calib_work; | 1492 | struct work_struct run_time_calib_work; |
1494 | struct timer_list statistics_periodic; | 1493 | struct timer_list statistics_periodic; |
1495 | struct timer_list ucode_trace; | 1494 | struct timer_list ucode_trace; |