iwlwifi: move iwl_set_hw_rfkill_state and mark it static
authorMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Tue, 13 Mar 2012 22:33:18 +0000 (15:33 -0700)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 12 Apr 2012 21:19:26 +0000 (14:19 -0700)
iwl_set_hw_rfkill_state is used only in
iwl-agn.c. Move it there and mark it static.

Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.h
drivers/net/wireless/iwlwifi/iwl-core.c

index 73985353bf7e7b6ec77015e4d88334fe3ee172d4..b0cadcc30b608ac8e76253abb068e8b022c389a8 100644 (file)
@@ -2217,6 +2217,18 @@ static void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)
        dev_kfree_skb_any(skb);
 }
 
+static void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
+{
+       struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+
+       if (state)
+               set_bit(STATUS_RF_KILL_HW, &priv->status);
+       else
+               clear_bit(STATUS_RF_KILL_HW, &priv->status);
+
+       wiphy_rfkill_set_hw_state(priv->hw->wiphy, state);
+}
+
 const struct iwl_op_mode_ops iwl_dvm_ops = {
        .start = iwl_op_mode_dvm_start,
        .stop = iwl_op_mode_dvm_stop,
index 6e8fd8bd55c8cdaf66b52c12645dedcca95fa161..3b66e30f3ee971d3ae7cb69a27733346f1ab3916 100644 (file)
@@ -100,7 +100,6 @@ void iwlagn_prepare_restart(struct iwl_priv *priv);
 int __must_check iwl_rx_dispatch(struct iwl_op_mode *op_mode,
                                 struct iwl_rx_cmd_buffer *rxb,
                                 struct iwl_device_cmd *cmd);
-void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state);
 
 bool iwl_check_for_ct_kill(struct iwl_priv *priv);
 
index efa6a912454657c9766578ccb8fa018bf5001207..e1129dccb33aa19ceaf3c4034aa5a3121ef1b528 100644 (file)
@@ -782,15 +782,3 @@ int iwl_cmd_echo_test(struct iwl_priv *priv)
                IWL_DEBUG_INFO(priv, "echo testing pass\n");
        return ret;
 }
-
-void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
-{
-       struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
-
-       if (state)
-               set_bit(STATUS_RF_KILL_HW, &priv->status);
-       else
-               clear_bit(STATUS_RF_KILL_HW, &priv->status);
-
-       wiphy_rfkill_set_hw_state(priv->hw->wiphy, state);
-}