diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-07-08 19:46:13 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-11 23:02:02 +0400 |
| commit | 06f491ef4b659fa6f6850f31d05a4a03db0d9d96 (patch) | |
| tree | 83a5bd89cf96ec78f26454d1719dca55e258fbe9 /drivers/net/wireless/iwlwifi | |
| parent | c170b867cc119fb9f6e9cac3a8245a3347bc718c (diff) | |
| download | linux-06f491ef4b659fa6f6850f31d05a4a03db0d9d96.tar.xz | |
iwlagn: remove code duplication
Code duplication was needed during the move, not needed any more.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 21 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.c | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c index f29b31d73be6..db3ec7aaf944 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c @@ -830,27 +830,6 @@ drop_unlock_priv: return -1; } -static inline int iwlagn_alloc_dma_ptr(struct iwl_priv *priv, - struct iwl_dma_ptr *ptr, size_t size) -{ - ptr->addr = dma_alloc_coherent(priv->bus.dev, size, - &ptr->dma, GFP_KERNEL); - if (!ptr->addr) - return -ENOMEM; - ptr->size = size; - return 0; -} - -static inline void iwlagn_free_dma_ptr(struct iwl_priv *priv, - struct iwl_dma_ptr *ptr) -{ - if (unlikely(!ptr->addr)) - return; - - dma_free_coherent(priv->bus.dev, ptr->size, ptr->addr, ptr->dma); - memset(ptr, 0, sizeof(*ptr)); -} - /* * Find first available (lowest unused) Tx Queue, mark it "active". * Called only when finding queue for aggregation. diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.c b/drivers/net/wireless/iwlwifi/iwl-trans.c index 81716fdd593a..de627f9ae10a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans.c @@ -197,7 +197,6 @@ static int iwl_trans_rx_stop(struct iwl_priv *priv) FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000); } -/* TODO:remove this code duplication */ static inline int iwlagn_alloc_dma_ptr(struct iwl_priv *priv, struct iwl_dma_ptr *ptr, size_t size) { |