[PATCH v3 2/3] staging: vt6655: Replace MACvReadISR with VNSvInPortD

From: Philipp Hortmann
Date: Wed Apr 27 2022 - 01:42:29 EST


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@xxxxxxxxx>
---
V1 -> V2: Shorted and simplified patch description
V2 -> V3: Added missing version in subject
---
drivers/staging/vt6655/device_main.c | 4 ++--
drivers/staging/vt6655/mac.h | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 7cceb57a5139..c21787f32252 100644
--- 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 74b45e1f0963..5aaa0de20e67 100644
--- 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)

--
2.25.1