Replace macro VNSvInPortW with ioread16.
The name of macro and the arguments use CamelCase which
is not accepted by checkpatch.pl
Since there are more than one checkpatch issue per line,
more steps are rquired to fix.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx>
---
V1 -> V2: This patch was 5/7 and is now 4/6
V2 -> V3: Changed from
"Rename macros VNSvInPortB,W,D with CamelCase ..." to
Replace VNSvInPortW with ioread16
This patch was 4/6 and is now 2/7
V3 -> V4: added Tab so that \ is inline with above and below lines
---
drivers/staging/vt6655/mac.h | 4 ++--
drivers/staging/vt6655/upc.h | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 7970a42ee6e6..4c6739862188 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -547,7 +547,7 @@ do { \
#define MACvWordRegBitsOn(iobase, byRegOfs, wBits) \
do { \
unsigned short wData; \
- VNSvInPortW(iobase + byRegOfs, &wData); \
+ wData = ioread16(iobase + byRegOfs); \
VNSvOutPortW(iobase + byRegOfs, wData | (wBits)); \
} while (0)
@@ -561,7 +561,7 @@ do { \
#define MACvWordRegBitsOff(iobase, byRegOfs, wBits) \
do { \
unsigned short wData; \
- VNSvInPortW(iobase + byRegOfs, &wData); \
+ wData = ioread16(iobase + byRegOfs); \
VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits)); \
} while (0)
diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h
index d2c1528c8e1b..4d09cf18ebe0 100644
--- a/drivers/staging/vt6655/upc.h
+++ b/drivers/staging/vt6655/upc.h
@@ -20,9 +20,6 @@
/* For memory mapped IO */
-#define VNSvInPortW(dwIOAddress, pwData) \
- (*(pwData) = ioread16(dwIOAddress))
-
#define VNSvInPortD(dwIOAddress, pdwData) \
(*(pdwData) = ioread32(dwIOAddress))
--
2.25.1
