From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sun, 6 Mar 2016 12:57:04 +0000 (+0000)
Subject: staging: vt6655: mac.c replace VNSvOutPortW with iowrite16
X-Git-Tag: v4.6-rc1~103^2~256
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=54a14e62f406197644384d7d68910997ce2fe203;p=karo-tx-linux.git

staging: vt6655: mac.c replace VNSvOutPortW with iowrite16

removig macro from functions.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index a9ddb9540582..43e5f66c45de 100644
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -757,9 +757,9 @@ void MACvSetMISCFifo(struct vnt_private *priv, unsigned short wOffset,
 
 	if (wOffset > 273)
 		return;
-	VNSvOutPortW(io_base + MAC_REG_MISCFFNDEX, wOffset);
+	iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX);
 	iowrite32(dwData, io_base + MAC_REG_MISCFFDATA);
-	VNSvOutPortW(io_base + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
+	iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL);
 }
 
 bool MACbPSWakeup(struct vnt_private *priv)
@@ -826,9 +826,9 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
 	pr_debug("1. wOffset: %d, Data: %X, KeyCtl:%X\n",
 		 wOffset, dwData, wKeyCtl);
 
-	VNSvOutPortW(io_base + MAC_REG_MISCFFNDEX, wOffset);
+	iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX);
 	iowrite32(dwData, io_base + MAC_REG_MISCFFDATA);
-	VNSvOutPortW(io_base + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
+	iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL);
 	wOffset++;
 
 	dwData = 0;
@@ -841,9 +841,9 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
 	dwData |= *(pbyAddr+0);
 	pr_debug("2. wOffset: %d, Data: %X\n", wOffset, dwData);
 
-	VNSvOutPortW(io_base + MAC_REG_MISCFFNDEX, wOffset);
+	iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX);
 	iowrite32(dwData, io_base + MAC_REG_MISCFFDATA);
-	VNSvOutPortW(io_base + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
+	iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL);
 	wOffset++;
 
 	wOffset += (uKeyIdx * 4);
@@ -851,9 +851,9 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
 		/* always push 128 bits */
 		pr_debug("3.(%d) wOffset: %d, Data: %X\n",
 			 ii, wOffset+ii, *pdwKey);
-		VNSvOutPortW(io_base + MAC_REG_MISCFFNDEX, wOffset+ii);
+		iowrite16(wOffset + ii, io_base + MAC_REG_MISCFFNDEX);
 		iowrite32(*pdwKey++, io_base + MAC_REG_MISCFFDATA);
-		VNSvOutPortW(io_base + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
+		iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL);
 	}
 }
 
@@ -879,7 +879,7 @@ void MACvDisableKeyEntry(struct vnt_private *priv, unsigned int uEntryIdx)
 	wOffset = MISCFIFO_KEYETRY0;
 	wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE);
 
-	VNSvOutPortW(io_base + MAC_REG_MISCFFNDEX, wOffset);
+	iowrite16(wOffset, io_base + MAC_REG_MISCFFNDEX);
 	iowrite32(0, io_base + MAC_REG_MISCFFDATA);
-	VNSvOutPortW(io_base + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
+	iowrite16(MISCFFCTL_WRITE, io_base + MAC_REG_MISCFFCTL);
 }