staging: vt6655: Replace MACvReceive1 with function vt6655_mac_dma_ctl

Convert macro MACvReceive1 to existing static function. This saves
codelines and multiline macros are not liked by kernel community.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/ec8dbbfeccb32e0b5c753702cb70d2749426c054.1659080988.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 5b4d3d7e1a0b0e67214919170f7e0356edd6da6c..ca38a38565f7c2705af13163dd4ea38f87f395e1 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -432,7 +432,7 @@ static void device_init_registers(struct vnt_private *priv)
 
        /* Turn On Rx DMA */
        vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0);
-       MACvReceive1(priv->port_offset);
+       vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL1);
 
        /* start the adapter */
        iowrite8(HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON, priv->port_offset + MAC_REG_HOSTCR);
@@ -1147,7 +1147,7 @@ static void vnt_interrupt_process(struct vnt_private *priv)
                isr = ioread32(priv->port_offset + MAC_REG_ISR);
 
                vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0);
-               MACvReceive1(priv->port_offset);
+               vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL1);
 
                if (max_count > priv->opts.int_works)
                        break;

diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index d21313f3067eaf140cade67a4d4466baffcb0b5c..5a473ca393f206d297fb3d17e49f90dcad2ffd2c 100644 (file)
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -537,16 +537,6 @@
 
 /*---------------------  Export Macros ------------------------------*/
 
-#define MACvReceive1(iobase)                                           \
-do {                                                                   \
-       unsigned long dwData;                                           \
-       dwData = ioread32(iobase + MAC_REG_RXDMACTL1);                  \
-       if (dwData & DMACTL_RUN)                                        \
-               iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL1);     \
-       else                                                            \
-               iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL1);      \
-} while (0)
-
 #define MACvTransmit0(iobase)                                          \
 do {                                                                   \
        unsigned long dwData;                                           \