staging: vt6655: Replace MACvReadISR with VNSvInPortD

Replace macro MACvReadISR with VNSvInPortD and as it was the only
user, it can now be removed.

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

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 7cceb57..c21787f 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1029,7 +1029,7 @@ static void vnt_interrupt_process(struct vnt_private *priv)
        u32 isr;
        unsigned long flags;
 
-       MACvReadISR(priv->port_offset, &isr);
+       VNSvInPortD(priv->port_offset + MAC_REG_ISR, &isr);
 
        if (isr == 0)
                return;
@@ -1116,7 +1116,7 @@ static void vnt_interrupt_process(struct vnt_private *priv)
                    ieee80211_queue_stopped(priv->hw, 0))
                        ieee80211_wake_queues(priv->hw);
 
-               MACvReadISR(priv->port_offset, &isr);
+               VNSvInPortD(priv->port_offset + MAC_REG_ISR, &isr);
 
                MACvReceive0(priv->port_offset);
                MACvReceive1(priv->port_offset);

diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 74b45e1..5aaa0de 100644 (file)
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -666,9 +666,6 @@ do {                                                                        \
        VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue);             \
 } while (0)
 
-#define MACvReadISR(iobase, pdwValue)                          \
-       VNSvInPortD(iobase + MAC_REG_ISR, pdwValue)
-
 #define MACvWriteISR(iobase, dwValue)                          \
        VNSvOutPortD(iobase + MAC_REG_ISR, dwValue)