staging: vt6655: Rename function MACvReceive0 and add parameter
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Fri, 29 Jul 2022 08:14:25 +0000 (10:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 16 Aug 2022 13:09:55 +0000 (15:09 +0200)
Rename MACvReceive0 function to vt6655_mac_dma_ctl to avoid CamelCase
which is not accepted by checkpatch.pl and to clean up namespace. Add
one parameter to avoid multiple repetitions of the same function.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/e5ca6208263d5aa3f1d6f0359fa602187d799f19.1659080988.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/device_main.c

index 59056425ba3bdbaf401958dd2616444fe13a145a..5b4d3d7e1a0b0e67214919170f7e0356edd6da6c 100644 (file)
@@ -205,15 +205,15 @@ static void vt6655_mac_read_ether_addr(void __iomem *iobase, u8 *mac_addr)
        iowrite8(0, iobase + MAC_REG_PAGE1SEL);
 }
 
-static void MACvReceive0(void __iomem *iobase)
+static void vt6655_mac_dma_ctl(void __iomem *iobase, u8 reg_index)
 {
        u32 reg_value;
 
-       reg_value = ioread32(iobase + MAC_REG_RXDMACTL0);
+       reg_value = ioread32(iobase + reg_index);
        if (reg_value & DMACTL_RUN)
-               iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL0);
+               iowrite32(DMACTL_WAKE, iobase + reg_index);
        else
-               iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL0);
+               iowrite32(DMACTL_RUN, iobase + reg_index);
 }
 
 /*
@@ -431,7 +431,7 @@ static void device_init_registers(struct vnt_private *priv)
                vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_RCR, RCR_WPAERR);
 
        /* Turn On Rx DMA */
-       MACvReceive0(priv->port_offset);
+       vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0);
        MACvReceive1(priv->port_offset);
 
        /* start the adapter */
@@ -1146,7 +1146,7 @@ static void vnt_interrupt_process(struct vnt_private *priv)
 
                isr = ioread32(priv->port_offset + MAC_REG_ISR);
 
-               MACvReceive0(priv->port_offset);
+               vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0);
                MACvReceive1(priv->port_offset);
 
                if (max_count > priv->opts.int_works)