staging: vt6655: Replace MACvIntDisable with VNSvOutPortD

Replace macro MACvIntDisable 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/937422bb879d8f1f58978bedc8d15559d28581c7.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 d9515eff05c3b503c6540e3b369d650f98a8c964..29ee0fd893cc8c553f5caa042c3c269002b0c036 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1143,7 +1143,7 @@ static irqreturn_t vnt_interrupt(int irq,  void *arg)
 
        schedule_work(&priv->interrupt_work);
 
-       MACvIntDisable(priv->port_offset);
+       VNSvOutPortD(priv->port_offset + MAC_REG_IMR, 0);
 
        return IRQ_HANDLED;
 }

diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index 88ddd067646318b6327009c6d2c4995ea64173f7..24eab18972d243179455966672a8309bd8d34078 100644 (file)
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -458,7 +458,7 @@ bool MACbShutdown(struct vnt_private *priv)
 {
        void __iomem *io_base = priv->port_offset;
        /* disable MAC IMR */
-       MACvIntDisable(io_base);
+       VNSvOutPortD(io_base + MAC_REG_IMR, 0);
        MACvSetLoopbackMode(priv, MAC_LB_INTERNAL);
        /* stop the adapter */
        if (!MACbSafeStop(priv)) {

diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 8b3ba94dd02eec10d4f6a1e3070938de7afc3ee5..a1d5eb52ddc465af281cfc123c3438693e4f1c93 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 MACvIntDisable(iobase)                         \
-       VNSvOutPortD(iobase + MAC_REG_IMR, 0)
-
 #define MACvSelectPage0(iobase)                                \
        iowrite8(0, iobase + MAC_REG_PAGE1SEL)