iwlwifi: move iwl4965_get_dma_hi_address function to iwl-helpers.h

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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index b913c6b921bc9ba7a7d812531162fb248a28c53b..a94578889e172c3c4c5798f6203e0f14606a9852 100644 (file)
--- 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 e2a8d95ad9cd8a5eaa8e9beb13b807594d29a17d..5228834758b18266396c19839ee14dae35cbc42a 100644 (file)
--- 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__ */