Skip to content

L
linux
Commit 5e76c8f4 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6655: device_main.c replace pDesc with desc. 

Removing camel case.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78e0e853
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
drivers/staging/vt6655/device_main.c
View file @ 5e76c8f4
...@@ -545,19 +545,19 @@ static void device_init_rd0_ring(struct vnt_private *priv) ...@@ -545,19 +545,19 @@ static void device_init_rd0_ring(struct vnt_private *priv)
{ {
int i; int i;
dma_addr_t curr = priv->rd0_pool_dma; dma_addr_t curr = priv->rd0_pool_dma;
struct vnt_rx_desc *pDesc; struct vnt_rx_desc *desc;
/* Init the RD0 ring entries */ /* Init the RD0 ring entries */
for (i = 0; i < priv->sOpts.nRxDescs0; for (i = 0; i < priv->sOpts.nRxDescs0;
i ++, curr += sizeof(struct vnt_rx_desc)) { i ++, curr += sizeof(struct vnt_rx_desc)) {
pDesc = &(priv->aRD0Ring[i]); desc = &priv->aRD0Ring[i];
pDesc->rd_info = alloc_rd_info(); desc->rd_info = alloc_rd_info();
if (!device_alloc_rx_buf(priv, pDesc)) if (!device_alloc_rx_buf(priv, desc))
dev_err(&priv->pcid->dev, "can not alloc rx bufs\n"); dev_err(&priv->pcid->dev, "can not alloc rx bufs\n");
pDesc->next = &(priv->aRD0Ring[(i+1) % priv->sOpts.nRxDescs0]); desc->next = &(priv->aRD0Ring[(i+1) % priv->sOpts.nRxDescs0]);
pDesc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_rx_desc)); desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_rx_desc));
} }
if (i > 0) if (i > 0)
...@@ -569,19 +569,19 @@ static void device_init_rd1_ring(struct vnt_private *priv) ...@@ -569,19 +569,19 @@ static void device_init_rd1_ring(struct vnt_private *priv)
{ {
int i; int i;
dma_addr_t curr = priv->rd1_pool_dma; dma_addr_t curr = priv->rd1_pool_dma;
struct vnt_rx_desc *pDesc; struct vnt_rx_desc *desc;
/* Init the RD1 ring entries */ /* Init the RD1 ring entries */
for (i = 0; i < priv->sOpts.nRxDescs1; for (i = 0; i < priv->sOpts.nRxDescs1;
i ++, curr += sizeof(struct vnt_rx_desc)) { i ++, curr += sizeof(struct vnt_rx_desc)) {
pDesc = &(priv->aRD1Ring[i]); desc = &priv->aRD1Ring[i];
pDesc->rd_info = alloc_rd_info(); desc->rd_info = alloc_rd_info();
if (!device_alloc_rx_buf(priv, pDesc)) if (!device_alloc_rx_buf(priv, desc))
dev_err(&priv->pcid->dev, "can not alloc rx bufs\n"); dev_err(&priv->pcid->dev, "can not alloc rx bufs\n");
pDesc->next = &(priv->aRD1Ring[(i+1) % priv->sOpts.nRxDescs1]); desc->next = &(priv->aRD1Ring[(i+1) % priv->sOpts.nRxDescs1]);
pDesc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_rx_desc)); desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_rx_desc));
} }
if (i > 0) if (i > 0)
...@@ -594,15 +594,15 @@ static void device_free_rd0_ring(struct vnt_private *priv) ...@@ -594,15 +594,15 @@ static void device_free_rd0_ring(struct vnt_private *priv)
int i; int i;
for (i = 0; i < priv->sOpts.nRxDescs0; i++) { for (i = 0; i < priv->sOpts.nRxDescs0; i++) {
struct vnt_rx_desc *pDesc = &(priv->aRD0Ring[i]); struct vnt_rx_desc *desc = &(priv->aRD0Ring[i]);
struct vnt_rd_info *rd_info = pDesc->rd_info; struct vnt_rd_info *rd_info = desc->rd_info;
dma_unmap_single(&priv->pcid->dev, rd_info->skb_dma, dma_unmap_single(&priv->pcid->dev, rd_info->skb_dma,
priv->rx_buf_sz, DMA_FROM_DEVICE); priv->rx_buf_sz, DMA_FROM_DEVICE);
dev_kfree_skb(rd_info->skb); dev_kfree_skb(rd_info->skb);
kfree(pDesc->rd_info); kfree(desc->rd_info);
} }
} }
...@@ -611,15 +611,15 @@ static void device_free_rd1_ring(struct vnt_private *priv) ...@@ -611,15 +611,15 @@ static void device_free_rd1_ring(struct vnt_private *priv)
int i; int i;
for (i = 0; i < priv->sOpts.nRxDescs1; i++) { for (i = 0; i < priv->sOpts.nRxDescs1; i++) {
struct vnt_rx_desc *pDesc = &(priv->aRD1Ring[i]); struct vnt_rx_desc *desc = &priv->aRD1Ring[i];
struct vnt_rd_info *rd_info = pDesc->rd_info; struct vnt_rd_info *rd_info = desc->rd_info;
dma_unmap_single(&priv->pcid->dev, rd_info->skb_dma, dma_unmap_single(&priv->pcid->dev, rd_info->skb_dma,
priv->rx_buf_sz, DMA_FROM_DEVICE); priv->rx_buf_sz, DMA_FROM_DEVICE);
dev_kfree_skb(rd_info->skb); dev_kfree_skb(rd_info->skb);
kfree(pDesc->rd_info); kfree(desc->rd_info);
} }
} }
...@@ -627,19 +627,19 @@ static void device_init_td0_ring(struct vnt_private *priv) ...@@ -627,19 +627,19 @@ static void device_init_td0_ring(struct vnt_private *priv)
{ {
int i; int i;
dma_addr_t curr; dma_addr_t curr;
struct vnt_tx_desc *pDesc; struct vnt_tx_desc *desc;
curr = priv->td0_pool_dma; curr = priv->td0_pool_dma;
for (i = 0; i < priv->sOpts.nTxDescs[0]; for (i = 0; i < priv->sOpts.nTxDescs[0];
i++, curr += sizeof(struct vnt_tx_desc)) { i++, curr += sizeof(struct vnt_tx_desc)) {
pDesc = &(priv->apTD0Rings[i]); desc = &priv->apTD0Rings[i];
pDesc->td_info = alloc_td_info(); desc->td_info = alloc_td_info();
pDesc->td_info->buf = priv->tx0_bufs + i * PKT_BUF_SZ; desc->td_info->buf = priv->tx0_bufs + i * PKT_BUF_SZ;
pDesc->td_info->buf_dma = priv->tx_bufs_dma0 + i * PKT_BUF_SZ; desc->td_info->buf_dma = priv->tx_bufs_dma0 + i * PKT_BUF_SZ;
pDesc->next = &(priv->apTD0Rings[(i+1) % priv->sOpts.nTxDescs[0]]); desc->next = &(priv->apTD0Rings[(i+1) % priv->sOpts.nTxDescs[0]]);
pDesc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc)); desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc));
} }
if (i > 0) if (i > 0)
...@@ -651,20 +651,20 @@ static void device_init_td1_ring(struct vnt_private *priv) ...@@ -651,20 +651,20 @@ static void device_init_td1_ring(struct vnt_private *priv)
{ {
int i; int i;
dma_addr_t curr; dma_addr_t curr;
struct vnt_tx_desc *pDesc; struct vnt_tx_desc *desc;
/* Init the TD ring entries */ /* Init the TD ring entries */
curr = priv->td1_pool_dma; curr = priv->td1_pool_dma;
for (i = 0; i < priv->sOpts.nTxDescs[1]; for (i = 0; i < priv->sOpts.nTxDescs[1];
i++, curr += sizeof(struct vnt_tx_desc)) { i++, curr += sizeof(struct vnt_tx_desc)) {
pDesc = &(priv->apTD1Rings[i]); desc = &priv->apTD1Rings[i];
pDesc->td_info = alloc_td_info(); desc->td_info = alloc_td_info();
pDesc->td_info->buf = priv->tx1_bufs + i * PKT_BUF_SZ; desc->td_info->buf = priv->tx1_bufs + i * PKT_BUF_SZ;
pDesc->td_info->buf_dma = priv->tx_bufs_dma1 + i * PKT_BUF_SZ; desc->td_info->buf_dma = priv->tx_bufs_dma1 + i * PKT_BUF_SZ;
pDesc->next = &(priv->apTD1Rings[(i + 1) % priv->sOpts.nTxDescs[1]]); desc->next = &(priv->apTD1Rings[(i + 1) % priv->sOpts.nTxDescs[1]]);
pDesc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc)); desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc));
} }
if (i > 0) if (i > 0)
...@@ -677,11 +677,11 @@ static void device_free_td0_ring(struct vnt_private *priv) ...@@ -677,11 +677,11 @@ static void device_free_td0_ring(struct vnt_private *priv)
int i; int i;
for (i = 0; i < priv->sOpts.nTxDescs[0]; i++) { for (i = 0; i < priv->sOpts.nTxDescs[0]; i++) {
struct vnt_tx_desc *pDesc = &priv->apTD0Rings[i]; struct vnt_tx_desc *desc = &priv->apTD0Rings[i];
struct vnt_td_info *pTDInfo = pDesc->td_info; struct vnt_td_info *pTDInfo = desc->td_info;
dev_kfree_skb(pTDInfo->skb); dev_kfree_skb(pTDInfo->skb);
kfree(pDesc->td_info); kfree(desc->td_info);
} }
} }
...@@ -690,11 +690,11 @@ static void device_free_td1_ring(struct vnt_private *priv) ...@@ -690,11 +690,11 @@ static void device_free_td1_ring(struct vnt_private *priv)
int i; int i;
for (i = 0; i < priv->sOpts.nTxDescs[1]; i++) { for (i = 0; i < priv->sOpts.nTxDescs[1]; i++) {
struct vnt_tx_desc *pDesc = &priv->apTD1Rings[i]; struct vnt_tx_desc *desc = &priv->apTD1Rings[i];
struct vnt_td_info *pTDInfo = pDesc->td_info; struct vnt_td_info *pTDInfo = desc->td_info;
dev_kfree_skb(pTDInfo->skb); dev_kfree_skb(pTDInfo->skb);
kfree(pDesc->td_info); kfree(desc->td_info);
} }
} }
...@@ -890,9 +890,9 @@ static void device_error(struct vnt_private *priv, unsigned short status) ...@@ -890,9 +890,9 @@ static void device_error(struct vnt_private *priv, unsigned short status)
} }
static void device_free_tx_buf(struct vnt_private *priv, static void device_free_tx_buf(struct vnt_private *priv,
struct vnt_tx_desc *pDesc) struct vnt_tx_desc *desc)
{ {
struct vnt_td_info *pTDInfo = pDesc->td_info; struct vnt_td_info *pTDInfo = desc->td_info;
struct sk_buff *skb = pTDInfo->skb; struct sk_buff *skb = pTDInfo->skb;
if (skb) if (skb)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7