staging: vt6655: Replace VNSvInPortW with ioread16

Replace macro VNSvInPortW with ioread16.
The name of macro and the arguments use CamelCase which
is not accepted by checkpatch.pl

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/2d55e245cc530ffafe53384df03691d1b29b495c.1650784817.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 7970a42ee6e6b5091cddc689b8112df2ca31d341..4c67398621885c1051be0dbbb659e22ed38d728c 100644 (file)
--- 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 d2c1528c8e1b1e823a1225ccae360bd07f70b88c..4d09cf18ebe0f9c08f7d82836f4357b829af326f 100644 (file)
--- 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))