mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 04:26:45 +00:00
staging: vt6655: mac.c replace byOrgDMACtl with org_dma_ctl
Removing camel case and type prefix. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
28029472aa
commit
ebc9bd832f
1 changed files with 16 additions and 16 deletions
|
@ -556,10 +556,10 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr)
|
||||||
{
|
{
|
||||||
void __iomem *io_base = priv->PortOffset;
|
void __iomem *io_base = priv->PortOffset;
|
||||||
unsigned short ww;
|
unsigned short ww;
|
||||||
unsigned char byOrgDMACtl;
|
unsigned char org_dma_ctl;
|
||||||
|
|
||||||
byOrgDMACtl = ioread8(io_base + MAC_REG_RXDMACTL0);
|
org_dma_ctl = ioread8(io_base + MAC_REG_RXDMACTL0);
|
||||||
if (byOrgDMACtl & DMACTL_RUN)
|
if (org_dma_ctl & DMACTL_RUN)
|
||||||
iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL0 + 2);
|
iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL0 + 2);
|
||||||
|
|
||||||
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
|
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
|
||||||
|
@ -568,7 +568,7 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr)
|
||||||
}
|
}
|
||||||
|
|
||||||
iowrite32(curr_desc_addr, io_base + MAC_REG_RXDMAPTR0);
|
iowrite32(curr_desc_addr, io_base + MAC_REG_RXDMAPTR0);
|
||||||
if (byOrgDMACtl & DMACTL_RUN)
|
if (org_dma_ctl & DMACTL_RUN)
|
||||||
iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL0);
|
iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -590,10 +590,10 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr)
|
||||||
{
|
{
|
||||||
void __iomem *io_base = priv->PortOffset;
|
void __iomem *io_base = priv->PortOffset;
|
||||||
unsigned short ww;
|
unsigned short ww;
|
||||||
unsigned char byOrgDMACtl;
|
unsigned char org_dma_ctl;
|
||||||
|
|
||||||
byOrgDMACtl = ioread8(io_base + MAC_REG_RXDMACTL1);
|
org_dma_ctl = ioread8(io_base + MAC_REG_RXDMACTL1);
|
||||||
if (byOrgDMACtl & DMACTL_RUN)
|
if (org_dma_ctl & DMACTL_RUN)
|
||||||
iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL1 + 2);
|
iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL1 + 2);
|
||||||
|
|
||||||
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
|
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
|
||||||
|
@ -602,7 +602,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr)
|
||||||
}
|
}
|
||||||
|
|
||||||
iowrite32(curr_desc_addr, io_base + MAC_REG_RXDMAPTR1);
|
iowrite32(curr_desc_addr, io_base + MAC_REG_RXDMAPTR1);
|
||||||
if (byOrgDMACtl & DMACTL_RUN)
|
if (org_dma_ctl & DMACTL_RUN)
|
||||||
iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL1);
|
iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL1);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -626,10 +626,10 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv,
|
||||||
{
|
{
|
||||||
void __iomem *io_base = priv->PortOffset;
|
void __iomem *io_base = priv->PortOffset;
|
||||||
unsigned short ww;
|
unsigned short ww;
|
||||||
unsigned char byOrgDMACtl;
|
unsigned char org_dma_ctl;
|
||||||
|
|
||||||
byOrgDMACtl = ioread8(io_base + MAC_REG_TXDMACTL0);
|
org_dma_ctl = ioread8(io_base + MAC_REG_TXDMACTL0);
|
||||||
if (byOrgDMACtl & DMACTL_RUN)
|
if (org_dma_ctl & DMACTL_RUN)
|
||||||
iowrite8(DMACTL_RUN, io_base + MAC_REG_TXDMACTL0 + 2);
|
iowrite8(DMACTL_RUN, io_base + MAC_REG_TXDMACTL0 + 2);
|
||||||
|
|
||||||
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
|
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
|
||||||
|
@ -638,7 +638,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv,
|
||||||
}
|
}
|
||||||
|
|
||||||
iowrite32(curr_desc_addr, io_base + MAC_REG_TXDMAPTR0);
|
iowrite32(curr_desc_addr, io_base + MAC_REG_TXDMAPTR0);
|
||||||
if (byOrgDMACtl & DMACTL_RUN)
|
if (org_dma_ctl & DMACTL_RUN)
|
||||||
iowrite8(DMACTL_RUN, io_base + MAC_REG_TXDMACTL0);
|
iowrite8(DMACTL_RUN, io_base + MAC_REG_TXDMACTL0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -662,10 +662,10 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv,
|
||||||
{
|
{
|
||||||
void __iomem *io_base = priv->PortOffset;
|
void __iomem *io_base = priv->PortOffset;
|
||||||
unsigned short ww;
|
unsigned short ww;
|
||||||
unsigned char byOrgDMACtl;
|
unsigned char org_dma_ctl;
|
||||||
|
|
||||||
byOrgDMACtl = ioread8(io_base + MAC_REG_AC0DMACTL);
|
org_dma_ctl = ioread8(io_base + MAC_REG_AC0DMACTL);
|
||||||
if (byOrgDMACtl & DMACTL_RUN)
|
if (org_dma_ctl & DMACTL_RUN)
|
||||||
iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL + 2);
|
iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL + 2);
|
||||||
|
|
||||||
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
|
for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
|
||||||
|
@ -675,7 +675,7 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv,
|
||||||
if (ww == W_MAX_TIMEOUT)
|
if (ww == W_MAX_TIMEOUT)
|
||||||
pr_debug(" DBG_PORT80(0x26)\n");
|
pr_debug(" DBG_PORT80(0x26)\n");
|
||||||
iowrite32(curr_desc_addr, io_base + MAC_REG_AC0DMAPTR);
|
iowrite32(curr_desc_addr, io_base + MAC_REG_AC0DMAPTR);
|
||||||
if (byOrgDMACtl & DMACTL_RUN)
|
if (org_dma_ctl & DMACTL_RUN)
|
||||||
iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL);
|
iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue