iwlwifi: remove bt_ch_announce module param

This parameter is really not useful, remove it.
Leave the variable in priv in case someone wants
to play with it.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index 7aa9c8dc33ef6a51a7a64f60fa8c76130690393a..71db0895602d71182a3abc6cd0e7c30946d18736 100644 (file)
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -1355,8 +1355,8 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                        IWL_BT_ANTENNA_COUPLING_THRESHOLD) ?
                        true : false;
 
-       /* enable/disable bt channel inhibition */
-       priv->bt_ch_announce = iwlwifi_mod_params.bt_ch_announce;
+       /* bt channel inhibition enabled*/
+       priv->bt_ch_announce = true;
        IWL_DEBUG_INFO(priv, "BT channel inhibition is %s\n",
                       (priv->bt_ch_announce) ? "On" : "Off");
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 4f886133639a100b0d5adba017e576ad238d54e9..01b9763f73149582c9633b5dc54b82668e083c3b 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -1112,7 +1112,6 @@ struct iwl_mod_params iwlwifi_mod_params = {
        .plcp_check = true,
        .bt_coex_active = true,
        .power_level = IWL_POWER_INDEX_1,
-       .bt_ch_announce = true,
        .auto_agg = true,
        .wd_disable = true,
        /* the rest are 0 by default */
@@ -1221,11 +1220,6 @@ module_param_named(antenna_coupling, iwlwifi_mod_params.ant_coupling,
 MODULE_PARM_DESC(antenna_coupling,
                 "specify antenna coupling in dB (defualt: 0 dB)");
 
-module_param_named(bt_ch_inhibition, iwlwifi_mod_params.bt_ch_announce,
-                  bool, S_IRUGO);
-MODULE_PARM_DESC(bt_ch_inhibition,
-                "Enable BT channel inhibition (default: enable)");
-
 module_param_named(plcp_check, iwlwifi_mod_params.plcp_check, bool, S_IRUGO);
 MODULE_PARM_DESC(plcp_check, "Check plcp health (default: 1 [enabled])");
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-modparams.h b/drivers/net/wireless/iwlwifi/iwl-modparams.h
index d4ad505b0a4bb9668cdc2d788f46986194d592ef..e2e64924c90d2a8637b003ea2f96cf4f896077c8 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-modparams.h
+++ b/drivers/net/wireless/iwlwifi/iwl-modparams.h
@@ -101,7 +101,6 @@ enum iwl_power_level {
  * @power_level: power level, default = 1
  * @debug_level: levels are IWL_DL_*
  * @ant_coupling: antenna coupling in dB, default = 0
- * @bt_ch_announce: BT channel inhibition, default = enable
  * @auto_agg: enable agg. without check, default = true
  */
 struct iwl_mod_params {
@@ -119,7 +118,6 @@ struct iwl_mod_params {
        u32 debug_level;
 #endif
        int ant_coupling;
-       bool bt_ch_announce;
        bool auto_agg;
        char *nvm_file;
 };