iwlwifi: removes the RUN_TIME_CALIB ifdef

This patch removes the possibility not to compile the run time
calibrations. It also renames priv->sensitivity_work to
priv->run_time_calib_work, and moves bg_run_time_calib to iwl4965_base
since it is common to both: 4965 and 5000.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 0 insertions, 28 deletions

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index b992428ab4d..a382c007892 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -14,15 +14,6 @@ config IWLWIFI_LEDS
         bool
         default n
 
-config IWLWIFI_RUN_TIME_CALIB
-        bool
-        depends on IWLCORE
-        default n
-        ---help---
-          This option will enable run time calibration for the iwlwifi driver.
-          These calibrations are Sensitivity and Chain Noise.
-
-
 config IWLWIFI_RFKILL
         boolean "IWLWIFI RF kill support"
         depends on IWLCORE
@@ -68,15 +59,6 @@ config IWL4965_SPECTRUM_MEASUREMENT
         ---help---
           This option will enable spectrum measurement for the iwl4965 driver.
 
-config IWL4965_RUN_TIME_CALIB
-        bool "Enable run time Calibration for 4965 NIC"
-        select IWLWIFI_RUN_TIME_CALIB
-        depends on IWL4965
-        default y
-        ---help---
-          This option will enable run time calibration for the iwl4965 driver.
-          These calibrations are Sensitivity and Chain Noise. If unsure, say yes
-
 config IWLWIFI_DEBUG
         bool "Enable full debugging output in iwl4965 driver"
         depends on IWL4965
@@ -110,16 +92,6 @@ config IWL5000
           This option enables support for Intel Wireless WiFi Link 5000AGN Family
           Dependency on 4965 is temporary
 
-config IWL5000_RUN_TIME_CALIB
-        bool "Enable run time Calibration for 5000 NIC"
-        select IWLWIFI_RUN_TIME_CALIB
-        depends on IWL5000
-        default y
-        ---help---
-          This option will enable run time calibration for the iwl5000 driver.
-          These calibrations are Sensitivity and Chain Noise. If unsure, say yes
-
-
 config IWLWIFI_DEBUGFS
         bool "Iwlwifi debugfs support"
         depends on IWLCORE && IWLWIFI_DEBUG && MAC80211_DEBUGFS