From: Reinette Chatre <reinette.chatre@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
Tomas Winkler <tomas.winkler@intel.com>,
Zhu Yi <yi.zhu@intel.com>
Subject: [PATCH 02/12] iwlwifi: move iwl4965_get_dma_hi_address function to iwl-helpers.h
Date: Mon, 14 Jan 2008 17:46:15 -0800 [thread overview]
Message-ID: <1200361585-31801-3-git-send-email-reinette.chatre@intel.com> (raw)
In-Reply-To: <1200361585-31801-2-git-send-email-reinette.chatre@intel.com>
From: Tomas Winkler <tomas.winkler@intel.com>
This patch moves iwl4965_get_dma_hi_address function to iwl-headers.h
as iwl_get_dma_hi_address. This function will be used in more chipsets
than only 4965.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-4965.c | 9 ++-------
drivers/net/wireless/iwlwifi/iwl-helpers.h | 5 +++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index b913c6b..a945788 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2797,11 +2797,6 @@ int iwl4965_hw_tx_queue_init(struct iwl4965_priv *priv, struct iwl4965_tx_queue
return 0;
}
-static inline u8 iwl4965_get_dma_hi_address(dma_addr_t addr)
-{
- return sizeof(addr) > sizeof(u32) ? (addr >> 16) >> 16 : 0;
-}
-
int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl4965_priv *priv, void *ptr,
dma_addr_t addr, u16 len)
{
@@ -2822,7 +2817,7 @@ int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl4965_priv *priv, void *ptr,
if (!is_odd) {
tfd->pa[index].tb1_addr = cpu_to_le32(addr);
IWL_SET_BITS(tfd->pa[index], tb1_addr_hi,
- iwl4965_get_dma_hi_address(addr));
+ iwl_get_dma_hi_address(addr));
IWL_SET_BITS(tfd->pa[index], tb1_len, len);
} else {
IWL_SET_BITS(tfd->pa[index], tb2_addr_lo16,
@@ -3289,7 +3284,7 @@ int iwl4965_tx_cmd(struct iwl4965_priv *priv, struct iwl4965_cmd *out_cmd,
scratch_phys = txcmd_phys + sizeof(struct iwl4965_cmd_header) +
offsetof(struct iwl4965_tx_cmd, scratch);
tx->dram_lsb_ptr = cpu_to_le32(scratch_phys);
- tx->dram_msb_ptr = iwl4965_get_dma_hi_address(scratch_phys);
+ tx->dram_msb_ptr = iwl_get_dma_hi_address(scratch_phys);
/* Hard coded to start at the highest retry fallback position
* until the 4965 specific rate control algorithm is tied in */
diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h
index e2a8d95..5228834 100644
--- a/drivers/net/wireless/iwlwifi/iwl-helpers.h
+++ b/drivers/net/wireless/iwlwifi/iwl-helpers.h
@@ -252,4 +252,9 @@ static inline unsigned long elapsed_jiffies(unsigned long start,
return end + (MAX_JIFFY_OFFSET - start);
}
+static inline u8 iwl_get_dma_hi_address(dma_addr_t addr)
+{
+ return sizeof(addr) > sizeof(u32) ? (addr >> 16) >> 16 : 0;
+}
+
#endif /* __iwl_helpers_h__ */
--
1.5.3.4
next prev parent reply other threads:[~2008-01-15 2:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-15 1:46 [PATCH 00/12] iwlwifi driver updates Reinette Chatre
2008-01-15 1:46 ` [PATCH 01/12] iwl4965: Remove redundant code in iwl4965_tx_cmd Reinette Chatre
2008-01-15 1:46 ` Reinette Chatre [this message]
2008-01-15 1:46 ` [PATCH 03/12] iwlwifi: remove iwl4965_tx_cmd Reinette Chatre
2008-01-15 1:46 ` [PATCH 04/12] iwlwifi: document scan command Reinette Chatre
2008-01-15 1:46 ` [PATCH 05/12] iwlwifi: delay firmware loading from pci_probe to network interface open Reinette Chatre
2008-01-15 1:46 ` [PATCH 06/12] iwlwifi: fix problem when rf_killswitch change during suspend/resume Reinette Chatre
2008-01-15 1:46 ` [PATCH 07/12] iwlwifi: move uCode helper functions to iwl-helpers.h Reinette Chatre
2008-01-15 1:46 ` [PATCH 08/12] iwlwifi: 4965 unify rate scale variable names for station data Reinette Chatre
2008-01-15 1:46 ` [PATCH 09/12] iwlwifi: 3954 renames iwl3945_rate_scale_priv to iwl3945_rs_sta Reinette Chatre
2008-01-15 1:46 ` [PATCH 10/12] iwlwifi: Update iwlwifi version stamp to 1.2.23 Reinette Chatre
2008-01-15 1:46 ` [PATCH 11/12] iwlwifi: remove reference to non-existent documentation Reinette Chatre
2008-01-15 1:46 ` [PATCH 12/12] iwlwifi: style fixes to usage of << and >> operators Reinette Chatre
2008-01-18 12:35 ` [PATCH 05/12] iwlwifi: delay firmware loading from pci_probe to network interface open Johannes Berg
2008-01-18 16:15 ` [PATCH 05/12] iwlwifi: delay firmware loading from pci_probeto " Chatre, Reinette
2008-01-16 0:02 ` [PATCH 04/12] iwlwifi: document scan command Johannes Berg
2008-01-18 16:34 ` Cahill, Ben M
2008-01-18 20:39 ` Johannes Berg
2008-01-21 15:51 ` Cahill, Ben M
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1200361585-31801-3-git-send-email-reinette.chatre@intel.com \
--to=reinette.chatre@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=tomas.winkler@intel.com \
--cc=yi.zhu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox