[PATCH 4/4] Remove cux_ prefix from tx and rx
Pontus Fuchs
pontus.fuchs at gmail.com
Tue May 28 04:05:23 EDT 2013
As there is no "prev", I see no reason to have a "cur".
Signed-off-by: Pontus Fuchs <pontus.fuchs at gmail.com>
---
dxe.c | 96 +++++++++++++++++++++++++++++++++----------------------------------
1 file changed, 48 insertions(+), 48 deletions(-)
diff --git a/dxe.c b/dxe.c
index 64d2d74..5b1e40d 100644
--- a/dxe.c
+++ b/dxe.c
@@ -286,8 +286,8 @@ void wcn36xx_rx_ready_work(struct work_struct *work)
{
struct wcn36xx *wcn =
container_of(work, struct wcn36xx, rx_ready_work);
- struct wcn36xx_dxe_desc *cur_dxe_desc = NULL;
- struct wcn36xx_dxe_ctl *cur_dxe_ctl = NULL;
+ struct wcn36xx_dxe_desc *desc = NULL;
+ struct wcn36xx_dxe_ctl *ctl = NULL;
int intSrc;
int int_reason;
@@ -311,29 +311,29 @@ void wcn36xx_rx_ready_work(struct work_struct *work)
/* Clean up ED INT Bit */
wcn36xx_dxe_write_register(wcn, WCN36XX_DXE_INT_END_CLR_ADDR, WCN36XX_INT_MASK_CHAN_RX_H);
- cur_dxe_ctl = wcn->dxe_rx_h_ch.head_blk_ctl;
- cur_dxe_desc = cur_dxe_ctl->desc;
+ ctl = wcn->dxe_rx_h_ch.head_blk_ctl;
+ desc = ctl->desc;
wcn36xx_dbg(WCN36XX_DBG_DXE,
"dxe rx ready order %d ctl %x",
- cur_dxe_ctl->ctl_blk_order,
- cur_dxe_desc->ctrl);
+ ctl->ctl_blk_order,
+ desc->ctrl);
dma_unmap_single( NULL,
- (dma_addr_t)cur_dxe_desc->dst_addr_l,
- cur_dxe_ctl->skb->len,
+ (dma_addr_t) desc->dst_addr_l,
+ ctl->skb->len,
DMA_FROM_DEVICE );
- wcn36xx_rx_skb(wcn, cur_dxe_ctl->skb);
+ wcn36xx_rx_skb(wcn, ctl->skb);
// Release RX descriptor
- cur_dxe_desc->ctrl = WCN36XX_DXE_CTRL_RX_H;
+ desc->ctrl = WCN36XX_DXE_CTRL_RX_H;
wcn36xx_dxe_write_register(wcn, WCN36XX_DXE_ENCH_ADDR, WCN36XX_INT_MASK_CHAN_RX_H);
// Reenable RX Low not high
wcn36xx_dxe_write_register(wcn, WCN36XX_DXE_REG_CTL_RX_L, WCN36XX_DXE_CH_DEFAULT_CTL_RX_L);
- wcn->dxe_rx_h_ch.head_blk_ctl = cur_dxe_ctl->next;
+ wcn->dxe_rx_h_ch.head_blk_ctl = ctl->next;
} else if (intSrc & WCN36XX_INT_MASK_CHAN_RX_L) {
/* Read Channel Status Register to know why INT Happen */
wcn36xx_dxe_read_register(wcn, WCN36XX_DXE_CH_STATUS_REG_ADDR_RX_L, &int_reason);
@@ -345,29 +345,29 @@ void wcn36xx_rx_ready_work(struct work_struct *work)
/* Clean up ED INT Bit */
wcn36xx_dxe_write_register(wcn, WCN36XX_DXE_INT_END_CLR_ADDR, WCN36XX_INT_MASK_CHAN_RX_L);
- cur_dxe_ctl = wcn->dxe_rx_l_ch.head_blk_ctl;
- cur_dxe_desc = cur_dxe_ctl->desc;
+ ctl = wcn->dxe_rx_l_ch.head_blk_ctl;
+ desc = ctl->desc;
wcn36xx_dbg(WCN36XX_DBG_DXE,
"dxe rx ready order %d ctl %x",
- cur_dxe_ctl->ctl_blk_order,
- cur_dxe_desc->ctrl);
+ ctl->ctl_blk_order,
+ desc->ctrl);
dma_unmap_single( NULL,
- (dma_addr_t)cur_dxe_desc->dst_addr_l,
- cur_dxe_ctl->skb->len,
+ (dma_addr_t)desc->dst_addr_l,
+ ctl->skb->len,
DMA_FROM_DEVICE );
- wcn36xx_rx_skb(wcn, cur_dxe_ctl->skb);
+ wcn36xx_rx_skb(wcn, ctl->skb);
// Release RX descriptor
- cur_dxe_desc->ctrl = WCN36XX_DXE_CTRL_RX_L;
+ desc->ctrl = WCN36XX_DXE_CTRL_RX_L;
wcn36xx_dxe_write_register(wcn, WCN36XX_DXE_ENCH_ADDR, WCN36XX_INT_MASK_CHAN_RX_L);
// Reenable RX Low not high
wcn36xx_dxe_write_register(wcn, WCN36XX_DXE_REG_CTL_RX_H, WCN36XX_DXE_CH_DEFAULT_CTL_RX_H);
- wcn->dxe_rx_l_ch.head_blk_ctl = cur_dxe_ctl->next;
+ wcn->dxe_rx_l_ch.head_blk_ctl = ctl->next;
}
enable_irq(wcn->rx_irq);
@@ -433,17 +433,17 @@ int wcn36xx_dxe_tx(struct wcn36xx *wcn,
bool is_high,
u32 header_len)
{
- struct wcn36xx_dxe_ctl *cur_dxe_ctl = NULL;
- struct wcn36xx_dxe_desc *cur_dxe_desc = NULL;
- struct wcn36xx_dxe_mem_pool * mem_pool = NULL;
- struct wcn36xx_dxe_ch * cur_ch = NULL;
+ struct wcn36xx_dxe_ctl *ctl = NULL;
+ struct wcn36xx_dxe_desc *desc = NULL;
+ struct wcn36xx_dxe_mem_pool *mem_pool = NULL;
+ struct wcn36xx_dxe_ch *ch = NULL;
if(is_high) {
mem_pool = &wcn->mgmt_mem_pool;
- cur_ch = &wcn->dxe_tx_h_ch;
+ ch = &wcn->dxe_tx_h_ch;
} else {
mem_pool = &wcn->data_mem_pool;
- cur_ch = &wcn->dxe_tx_l_ch;
+ ch = &wcn->dxe_tx_l_ch;
}
wcn36xx_prepare_tx_bd(mem_pool->virt_addr, skb->len, header_len);
@@ -454,53 +454,53 @@ int wcn36xx_dxe_tx(struct wcn36xx *wcn,
wcn36xx_fill_tx_bd(wcn, mem_pool->virt_addr, broadcast, 1);
}
- cur_dxe_ctl = cur_ch->head_blk_ctl;
- cur_dxe_desc = cur_dxe_ctl->desc;
+ ctl = ch->head_blk_ctl;
+ desc = ctl->desc;
// Let's not forget the frame we are sending
- cur_dxe_ctl->frame = mem_pool->virt_addr;
+ ctl->frame = mem_pool->virt_addr;
// Set source address of the BD we send
- cur_dxe_desc->src_addr_l = (int)mem_pool->phy_addr;
+ desc->src_addr_l = (int)mem_pool->phy_addr;
- cur_dxe_desc->dst_addr_l = cur_ch->dxe_wq;
- cur_dxe_desc->fr_len = sizeof(struct wcn36xx_tx_bd);
- cur_dxe_desc->ctrl = cur_ch->ctrl_bd;
+ desc->dst_addr_l = ch->dxe_wq;
+ desc->fr_len = sizeof(struct wcn36xx_tx_bd);
+ desc->ctrl = ch->ctrl_bd;
wcn36xx_dbg(WCN36XX_DBG_DXE, "DXE TX");
wcn36xx_dbg_dump(WCN36XX_DBG_DXE_DUMP, "DESC1 >>> ",
- (char*)cur_dxe_desc, sizeof(*cur_dxe_desc));
+ (char *)desc, sizeof(*desc));
wcn36xx_dbg_dump(WCN36XX_DBG_DXE_DUMP,
- "BD >>> ", (char*)mem_pool->virt_addr,
+ "BD >>> ", (char *)mem_pool->virt_addr,
sizeof(struct wcn36xx_tx_bd));
// Set source address of the SKB we send
- cur_dxe_ctl = (struct wcn36xx_dxe_ctl*)cur_dxe_ctl->next;
- cur_dxe_ctl->skb = skb;
- cur_dxe_desc = cur_dxe_ctl->desc;
- cur_dxe_desc->src_addr_l = (int)dma_map_single(NULL,
- cur_dxe_ctl->skb->data,
- cur_dxe_ctl->skb->len,
+ ctl = (struct wcn36xx_dxe_ctl *)ctl->next;
+ ctl->skb = skb;
+ desc = ctl->desc;
+ desc->src_addr_l = (int)dma_map_single(NULL,
+ ctl->skb->data,
+ ctl->skb->len,
DMA_TO_DEVICE );
- cur_dxe_desc->dst_addr_l = cur_ch->dxe_wq;
- cur_dxe_desc->fr_len = cur_dxe_ctl->skb->len;
+ desc->dst_addr_l = ch->dxe_wq;
+ desc->fr_len = ctl->skb->len;
// set it to VALID
- cur_dxe_desc->ctrl = cur_ch->ctrl_skb;
+ desc->ctrl = ch->ctrl_skb;
wcn36xx_dbg_dump(WCN36XX_DBG_DXE_DUMP, "DESC2 >>> ",
- (char*)cur_dxe_desc, sizeof(*cur_dxe_desc));
+ (char *)desc, sizeof(*desc));
wcn36xx_dbg_dump(WCN36XX_DBG_DXE_DUMP, "SKB >>> ",
- (char*)cur_dxe_ctl->skb->data, cur_dxe_ctl->skb->len);
+ (char *)ctl->skb->data, ctl->skb->len);
// Move the head of the ring to the next empty descriptor
- cur_ch->head_blk_ctl = cur_dxe_ctl->next;
+ ch->head_blk_ctl = ctl->next;
//indicate End Of Packet and generate interrupt on descriptor Done
wcn36xx_dxe_write_register(wcn,
- cur_ch->reg_ctrl, cur_ch->def_ctrl);
+ ch->reg_ctrl, ch->def_ctrl);
return 0;
}
int wcn36xx_dxe_init(struct wcn36xx *wcn)
--
1.8.1.2
More information about the wcn36xx
mailing list