aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-09-22 12:02:12 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-10-07 18:53:00 -0400
commita313f3839eeeebb3cbbcf1fbd2aee92bde389032 (patch)
tree3fa94fcf72239e0c544f5f733a0080a400913079 /drivers/net/wireless
parent0de76736552cff02cc6ee4bae41e5502d7673f8e (diff)
iwlwifi: remove iwl_check_bits
The function is used exactly once, and the caller doesn't even need the special check, it can be simplified to a simple bit check. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-helpers.h5
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index b06a7bd8b285..7d74ae53950c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -348,7 +348,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv,
348 IWL_DEBUG_TX_REPLY(priv, "Tx queue reclaim %d\n", index); 348 IWL_DEBUG_TX_REPLY(priv, "Tx queue reclaim %d\n", index);
349 iwl3945_tx_queue_reclaim(priv, txq_id, index); 349 iwl3945_tx_queue_reclaim(priv, txq_id, index);
350 350
351 if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) 351 if (status & TX_ABORT_REQUIRED_MSK)
352 IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n"); 352 IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n");
353} 353}
354 354
diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h
index 621abe3c5afc..1aaef70deaec 100644
--- a/drivers/net/wireless/iwlwifi/iwl-helpers.h
+++ b/drivers/net/wireless/iwlwifi/iwl-helpers.h
@@ -44,11 +44,6 @@ static inline struct ieee80211_conf *ieee80211_get_hw_conf(
44 return &hw->conf; 44 return &hw->conf;
45} 45}
46 46
47static inline int iwl_check_bits(unsigned long field, unsigned long mask)
48{
49 return ((field & mask) == mask) ? 1 : 0;
50}
51
52static inline unsigned long elapsed_jiffies(unsigned long start, 47static inline unsigned long elapsed_jiffies(unsigned long start,
53 unsigned long end) 48 unsigned long end)
54{ 49{