diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-05 14:24:45 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-06 15:16:14 -0500 |
commit | 0439bb6200153406abb81b469b82d2336be0d175 (patch) | |
tree | 4254836a1cc0d7b5d985ed7eddb9b968acec41b0 | |
parent | 70a18c5d57998433d9f4de058a5286fbd16ed839 (diff) |
iwlwifi: move IWL_MASK into file using it
Only used in two places in the same file,
no need to be in iwl-shared.h.
Signed-off-by: Johannes Berg <johannes.berg@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-shared.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index 740a058b22ee..976e6c584ac7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h | |||
@@ -444,7 +444,6 @@ iwl_remove_notification(struct iwl_shared *shrd, | |||
444 | struct iwl_notification_wait *wait_entry); | 444 | struct iwl_notification_wait *wait_entry); |
445 | 445 | ||
446 | #define IWL_CMD(x) case x: return #x | 446 | #define IWL_CMD(x) case x: return #x |
447 | #define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo)))) | ||
448 | 447 | ||
449 | #define IWL_TRAFFIC_ENTRIES (256) | 448 | #define IWL_TRAFFIC_ENTRIES (256) |
450 | #define IWL_TRAFFIC_ENTRY_SIZE (64) | 449 | #define IWL_TRAFFIC_ENTRY_SIZE (64) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index bb8f2fdf1281..3ae2fd720ed8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |||
@@ -78,6 +78,8 @@ | |||
78 | #include "iwl-core.h" | 78 | #include "iwl-core.h" |
79 | #include "iwl-ucode.h" | 79 | #include "iwl-ucode.h" |
80 | 80 | ||
81 | #define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo)))) | ||
82 | |||
81 | static int iwl_trans_rx_alloc(struct iwl_trans *trans) | 83 | static int iwl_trans_rx_alloc(struct iwl_trans *trans) |
82 | { | 84 | { |
83 | struct iwl_trans_pcie *trans_pcie = | 85 | struct iwl_trans_pcie *trans_pcie = |