diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2016-03-06 12:57:09 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-10 19:19:16 -0800 |
commit | 28029472aa1e18fd5c5777379eb28c8f7b837381 (patch) | |
tree | 5bb1021c2033cdf8617ece02c960c7b2ac0e354d /drivers | |
parent | 17c4c51e0360e72dc752768927cd13a00c06e421 (diff) | |
download | linux-28029472aa1e18fd5c5777379eb28c8f7b837381.tar.bz2 |
staging: vt6655: mac Replace dwCurrDescAddr with curr_desc_addr.
Removing camel case and type prefix.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/vt6655/mac.c | 30 | ||||
-rw-r--r-- | drivers/staging/vt6655/mac.h | 14 |
2 files changed, 22 insertions, 22 deletions
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index a1be62d56fba..d44026b76e21 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -545,14 +545,14 @@ void MACvInitialize(struct vnt_private *priv) * Parameters: * In: * io_base - Base Address for MAC - * dwCurrDescAddr - Descriptor Address + * curr_desc_addr - Descriptor Address * Out: * none * * Return Value: none * */ -void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) +void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -567,7 +567,7 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) break; } - iowrite32(dwCurrDescAddr, io_base + MAC_REG_RXDMAPTR0); + iowrite32(curr_desc_addr, io_base + MAC_REG_RXDMAPTR0); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL0); } @@ -579,14 +579,14 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) * Parameters: * In: * io_base - Base Address for MAC - * dwCurrDescAddr - Descriptor Address + * curr_desc_addr - Descriptor Address * Out: * none * * Return Value: none * */ -void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) +void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -601,7 +601,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) break; } - iowrite32(dwCurrDescAddr, io_base + MAC_REG_RXDMAPTR1); + iowrite32(curr_desc_addr, io_base + MAC_REG_RXDMAPTR1); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL1); @@ -614,7 +614,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) * Parameters: * In: * io_base - Base Address for MAC - * dwCurrDescAddr - Descriptor Address + * curr_desc_addr - Descriptor Address * Out: * none * @@ -622,7 +622,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 dwCurrDescAddr) * */ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, - u32 dwCurrDescAddr) + u32 curr_desc_addr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -637,7 +637,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, break; } - iowrite32(dwCurrDescAddr, io_base + MAC_REG_TXDMAPTR0); + iowrite32(curr_desc_addr, io_base + MAC_REG_TXDMAPTR0); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_TXDMACTL0); } @@ -649,7 +649,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, * Parameters: * In: * io_base - Base Address for MAC - * dwCurrDescAddr - Descriptor Address + * curr_desc_addr - Descriptor Address * Out: * none * @@ -658,7 +658,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, */ /* TxDMA1 = AC0DMA */ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, - u32 dwCurrDescAddr) + u32 curr_desc_addr) { void __iomem *io_base = priv->PortOffset; unsigned short ww; @@ -674,18 +674,18 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, } if (ww == W_MAX_TIMEOUT) pr_debug(" DBG_PORT80(0x26)\n"); - iowrite32(dwCurrDescAddr, io_base + MAC_REG_AC0DMAPTR); + iowrite32(curr_desc_addr, io_base + MAC_REG_AC0DMAPTR); if (byOrgDMACtl & DMACTL_RUN) iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL); } void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, - u32 dwCurrDescAddr) + u32 curr_desc_addr) { if (iTxType == TYPE_AC0DMA) - MACvSetCurrAC0DescAddrEx(priv, dwCurrDescAddr); + MACvSetCurrAC0DescAddrEx(priv, curr_desc_addr); else if (iTxType == TYPE_TXDMA0) - MACvSetCurrTx0DescAddrEx(priv, dwCurrDescAddr); + MACvSetCurrTx0DescAddrEx(priv, curr_desc_addr); } /* diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3eef928aa107..030f529c339b 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -916,19 +916,19 @@ bool MACbSafeStop(struct vnt_private *); bool MACbShutdown(struct vnt_private *); void MACvInitialize(struct vnt_private *); void MACvSetCurrRx0DescAddr(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrRx1DescAddr(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrTx0DescAddrEx(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrAC0DescAddrEx(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrSyncDescAddrEx(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvSetCurrATIMDescAddrEx(struct vnt_private *, - u32 dwCurrDescAddr); + u32 curr_desc_addr); void MACvTimer0MicroSDelay(struct vnt_private *, unsigned int uDelay); void MACvOneShotTimer1MicroSec(struct vnt_private *, unsigned int uDelayTime); |