Removing the macro from functions.
Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6655/mac.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index ece2bf0..a1be62d 100644
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -558,7 +558,7 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32
dwCurrDescAddr)
unsigned short ww;
unsigned char byOrgDMACtl;
- VNSvInPortB(io_base + MAC_REG_RXDMACTL0, &byOrgDMACtl);
+ byOrgDMACtl = ioread8(io_base + MAC_REG_RXDMACTL0);
if (byOrgDMACtl & DMACTL_RUN)
iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL0 + 2);
@@ -592,7 +592,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32
dwCurrDescAddr)
unsigned short ww;
unsigned char byOrgDMACtl;
- VNSvInPortB(io_base + MAC_REG_RXDMACTL1, &byOrgDMACtl);
+ byOrgDMACtl = ioread8(io_base + MAC_REG_RXDMACTL1);
if (byOrgDMACtl & DMACTL_RUN)
iowrite8(DMACTL_RUN, io_base + MAC_REG_RXDMACTL1 + 2);
@@ -628,7 +628,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv,
unsigned short ww;
unsigned char byOrgDMACtl;
- VNSvInPortB(io_base + MAC_REG_TXDMACTL0, &byOrgDMACtl);
+ byOrgDMACtl = ioread8(io_base + MAC_REG_TXDMACTL0);
if (byOrgDMACtl & DMACTL_RUN)
iowrite8(DMACTL_RUN, io_base + MAC_REG_TXDMACTL0 + 2);
@@ -664,7 +664,7 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv,
unsigned short ww;
unsigned char byOrgDMACtl;
- VNSvInPortB(io_base + MAC_REG_AC0DMACTL, &byOrgDMACtl);
+ byOrgDMACtl = ioread8(io_base + MAC_REG_AC0DMACTL);
if (byOrgDMACtl & DMACTL_RUN)
iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL + 2);
@@ -713,7 +713,7 @@ void MACvTimer0MicroSDelay(struct vnt_private *priv,
unsigned int uDelay)
iowrite8((TMCTL_TMD | TMCTL_TE), io_base + MAC_REG_TMCTL0);
for (ii = 0; ii < 66; ii++) { /* assume max PCI clock is 66Mhz */
for (uu = 0; uu < uDelay; uu++) {
- VNSvInPortB(io_base + MAC_REG_TMCTL0, &byValue);
+ byValue = ioread8(io_base + MAC_REG_TMCTL0);
if ((byValue == 0) ||
(byValue & TMCTL_TSUSP)) {
iowrite8(0, io_base + MAC_REG_TMCTL0);
--
2.7.0
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
