Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a297d95d authored by Meenakshi Venkataraman's avatar Meenakshi Venkataraman Committed by Wey-Yi Guy
Browse files

iwlwifi: move iwl_set_hw_rfkill_state and mark it static 



iwl_set_hw_rfkill_state is used only in
iwl-agn.c. Move it there and mark it static.

Signed-off-by: default avatarMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent ae625db3

drivers/net/wireless/iwlwifi/iwl-agn.c

+12 −0
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/iwlwifi/iwl-agn.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/iwlwifi/iwl-core.c

+0 −12
Original line number Diff line number Diff line
@@ -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);

}