diff options
author | Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> | 2012-03-15 16:26:55 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-09 16:37:26 -0400 |
commit | 19469f47d8134f0867dd75237a4fc46db3928554 (patch) | |
tree | f05ee76793775c0f2144e30e57f32a24946cdbb3 | |
parent | b7e21bf049dea32d981911b49c7faf7d0f701454 (diff) |
iwlwifi: make iwl_nic_error static
iwl_nic_error is used in iwl-agn.c only, move
it there and make it static.
Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 3c49c044240..37060aa015c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1556,6 +1556,13 @@ static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode) | |||
1556 | ieee80211_free_hw(priv->hw); | 1556 | ieee80211_free_hw(priv->hw); |
1557 | } | 1557 | } |
1558 | 1558 | ||
1559 | static void iwl_nic_error(struct iwl_op_mode *op_mode) | ||
1560 | { | ||
1561 | struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode); | ||
1562 | |||
1563 | iwlagn_fw_error(priv, false); | ||
1564 | } | ||
1565 | |||
1559 | static void iwl_cmd_queue_full(struct iwl_op_mode *op_mode) | 1566 | static void iwl_cmd_queue_full(struct iwl_op_mode *op_mode) |
1560 | { | 1567 | { |
1561 | struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode); | 1568 | struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index 22fc363e11b..882261badbe 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h | |||
@@ -92,7 +92,6 @@ int __must_check iwl_rx_dispatch(struct iwl_op_mode *op_mode, | |||
92 | struct iwl_rx_cmd_buffer *rxb, | 92 | struct iwl_rx_cmd_buffer *rxb, |
93 | struct iwl_device_cmd *cmd); | 93 | struct iwl_device_cmd *cmd); |
94 | void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state); | 94 | void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state); |
95 | void iwl_nic_error(struct iwl_op_mode *op_mode); | ||
96 | 95 | ||
97 | bool iwl_check_for_ct_kill(struct iwl_priv *priv); | 96 | bool iwl_check_for_ct_kill(struct iwl_priv *priv); |
98 | 97 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index e59cb5b568a..0a9bc9853e5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -1451,13 +1451,6 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base, | |||
1451 | return cpu_to_le32(res); | 1451 | return cpu_to_le32(res); |
1452 | } | 1452 | } |
1453 | 1453 | ||
1454 | void iwl_nic_error(struct iwl_op_mode *op_mode) | ||
1455 | { | ||
1456 | struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode); | ||
1457 | |||
1458 | iwlagn_fw_error(priv, false); | ||
1459 | } | ||
1460 | |||
1461 | void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) | 1454 | void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) |
1462 | { | 1455 | { |
1463 | struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode); | 1456 | struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode); |