Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06f491ef authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: remove code duplication 



Code duplication was needed during the move, not needed any more.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c170b867

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+0 −21
Original line number Diff line number Diff line
@@ -830,27 +830,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	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.

drivers/net/wireless/iwlwifi/iwl-trans.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

{