Commit efa21f9d authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6655: mac.c replace dwData with data.

Removing camel case and type prefix.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e7997c1
...@@ -748,14 +748,14 @@ void MACvOneShotTimer1MicroSec(struct vnt_private *priv, unsigned int uDelayTime ...@@ -748,14 +748,14 @@ void MACvOneShotTimer1MicroSec(struct vnt_private *priv, unsigned int uDelayTime
} }
void MACvSetMISCFifo(struct vnt_private *priv, unsigned short offset, void MACvSetMISCFifo(struct vnt_private *priv, unsigned short offset,
u32 dwData) u32 data)
{ {
void __iomem *io_base = priv->PortOffset; void __iomem *io_base = priv->PortOffset;
if (offset > 273) if (offset > 273)
return; return;
iowrite16(offset, io_base + MAC_REG_MISCFFNDEX); iowrite16(offset, io_base + MAC_REG_MISCFFNDEX);
iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); iowrite32(data, io_base + MAC_REG_MISCFFDATA);
iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL);
} }
...@@ -804,7 +804,7 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, ...@@ -804,7 +804,7 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
{ {
void __iomem *io_base = priv->PortOffset; void __iomem *io_base = priv->PortOffset;
unsigned short offset; unsigned short offset;
u32 dwData; u32 data;
int ii; int ii;
if (byLocalID <= 1) if (byLocalID <= 1)
...@@ -814,30 +814,30 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl, ...@@ -814,30 +814,30 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
offset = MISCFIFO_KEYETRY0; offset = MISCFIFO_KEYETRY0;
offset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); offset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE);
dwData = 0; data = 0;
dwData |= wKeyCtl; data |= wKeyCtl;
dwData <<= 16; data <<= 16;
dwData |= MAKEWORD(*(pbyAddr+4), *(pbyAddr+5)); data |= MAKEWORD(*(pbyAddr + 4), *(pbyAddr + 5));
pr_debug("1. offset: %d, Data: %X, KeyCtl:%X\n", pr_debug("1. offset: %d, Data: %X, KeyCtl:%X\n",
offset, dwData, wKeyCtl); offset, data, wKeyCtl);
iowrite16(offset, io_base + MAC_REG_MISCFFNDEX); iowrite16(offset, io_base + MAC_REG_MISCFFNDEX);
iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); iowrite32(data, io_base + MAC_REG_MISCFFDATA);
iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL);
offset++; offset++;
dwData = 0; data = 0;
dwData |= *(pbyAddr+3); data |= *(pbyAddr + 3);
dwData <<= 8; data <<= 8;
dwData |= *(pbyAddr+2); data |= *(pbyAddr + 2);
dwData <<= 8; data <<= 8;
dwData |= *(pbyAddr+1); data |= *(pbyAddr + 1);
dwData <<= 8; data <<= 8;
dwData |= *(pbyAddr+0); data |= *pbyAddr;
pr_debug("2. offset: %d, Data: %X\n", offset, dwData); pr_debug("2. offset: %d, Data: %X\n", offset, data);
iowrite16(offset, io_base + MAC_REG_MISCFFNDEX); iowrite16(offset, io_base + MAC_REG_MISCFFNDEX);
iowrite32(dwData, io_base + MAC_REG_MISCFFDATA); iowrite32(data, io_base + MAC_REG_MISCFFDATA);
iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL); iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL);
offset++; offset++;
......
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