staging: vt6655: Replace MACvIntEnable with VNSvOutPortD

Replace macro MACvIntEnable with VNSvOutPortD and as it
was only used twice, it can now be removed.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/182b9f8edd1ce3f6ff12a2942e990dae0f80099a.1653203927.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 41bc87d..d9515ef 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1134,7 +1134,7 @@ static void vnt_interrupt_work(struct work_struct *work)
        if (priv->vif)
                vnt_interrupt_process(priv);
 
-       MACvIntEnable(priv->port_offset, IMR_MASK_VALUE);
+       VNSvOutPortD(priv->port_offset + MAC_REG_IMR, IMR_MASK_VALUE);
 }
 
 static irqreturn_t vnt_interrupt(int irq,  void *arg)
@@ -1252,8 +1252,8 @@ static int vnt_start(struct ieee80211_hw *hw)
 
        device_init_registers(priv);
 
-       dev_dbg(&priv->pcid->dev, "call MACvIntEnable\n");
-       MACvIntEnable(priv->port_offset, IMR_MASK_VALUE);
+       dev_dbg(&priv->pcid->dev, "enable MAC interrupt\n");
+       VNSvOutPortD(priv->port_offset + MAC_REG_IMR, IMR_MASK_VALUE);
 
        ieee80211_wake_queues(hw);
 

diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 42b2168..8b3ba94 100644 (file)
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -648,9 +648,6 @@ do {                                                                        \
        iowrite8(byOrgValue, iobase + MAC_REG_STICKHW);                 \
 } while (0)
 
-#define MACvIntEnable(iobase, dwMask)                          \
-       VNSvOutPortD(iobase + MAC_REG_IMR, dwMask)
-
 #define MACvIntDisable(iobase)                         \
        VNSvOutPortD(iobase + MAC_REG_IMR, 0)