[PATCH 1/2] Rename cpu and dma addresses in wcn36xx_dxe_ch

Pontus Fuchs pontus.fuchs at gmail.com
Fri May 24 05:01:17 EDT 2013


Remove the meaningless prefix.
Fix some whitespace errors.

Signed-off-by: Pontus Fuchs <pontus.fuchs at gmail.com>
---
 dxe.c | 9 ++++-----
 dxe.h | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dxe.c b/dxe.c
index 70dd603..d841205 100644
--- a/dxe.c
+++ b/dxe.c
@@ -166,18 +166,17 @@ static int wcn36xx_dxe_init_descs(struct wcn36xx_dxe_ch *wcn_ch)
 	int i;
 
 	size = wcn_ch->desc_num * sizeof(struct wcn36xx_dxe_desc);
-	wcn_ch->descs_cpu_addr =
-		wcn36xx_dma_alloc(size, (void**)&wcn_ch->descs_dma_addr);
-	if (!wcn_ch->descs_cpu_addr)
+	wcn_ch->cpu_addr = wcn36xx_dma_alloc(size, (void **)&wcn_ch->dma_addr);
+	if (!wcn_ch->cpu_addr)
 		return -ENOMEM;
 
-	cur_dxe_desc = (struct wcn36xx_dxe_desc*)wcn_ch->descs_cpu_addr;
+	cur_dxe_desc = (struct wcn36xx_dxe_desc *)wcn_ch->cpu_addr;
 	cur_dxe_ctl = wcn_ch->head_blk_ctl;
 
 	for (i = 0; i < wcn_ch->desc_num; i++)
 	{
 		cur_dxe_ctl->desc = cur_dxe_desc;
-		cur_dxe_ctl->desc_phy_addr = wcn_ch->descs_dma_addr +
+		cur_dxe_ctl->desc_phy_addr = wcn_ch->dma_addr +
 			i * sizeof(struct wcn36xx_dxe_desc);
 
 		switch (wcn_ch->ch_type) {
diff --git a/dxe.h b/dxe.h
index f67a89d..d240a60 100644
--- a/dxe.h
+++ b/dxe.h
@@ -203,9 +203,9 @@ struct wcn36xx_dxe_mem_info {
 
 
 struct wcn36xx_dxe_ch {
-	enum wcn36xx_dxe_ch_type  	ch_type;
-	void 				*descs_cpu_addr;
-	dma_addr_t 			descs_dma_addr;
+	enum wcn36xx_dxe_ch_type	ch_type;
+	void				*cpu_addr;
+	dma_addr_t			dma_addr;
 	enum wcn36xx_dxe_ch_desc_num	desc_num;
 	// DXE control block ring
 	struct wcn36xx_dxe_ctl		*head_blk_ctl;
@@ -222,7 +222,7 @@ struct wcn36xx_dxe_ch {
 
 // Memory Pool for BD headers
 struct wcn36xx_dxe_mem_pool {
-	int 	chunk_size;		// size of every chunk
+	int	chunk_size;		// size of every chunk
 	void	*virt_addr;		// virtual address that is visible to CPU
 	void	*phy_addr;		// physical address that
 	void	*bitmap;		// bitmap array for all headers
-- 
1.8.1.2




More information about the wcn36xx mailing list