aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655
diff options
context:
space:
mode:
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>2022-07-29 10:14:25 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-16 15:09:55 +0200
commit1795826c0e31939cebfb6d85f21dfbf7b94ec076 (patch)
tree4448d440394e5ef94eaab3a7cae545d989fe6166 /drivers/staging/vt6655
parentstaging: vt6655: Convert macro MACvReceive0 to function (diff)
downloadlinux-dev-1795826c0e31939cebfb6d85f21dfbf7b94ec076.tar.xz
linux-dev-1795826c0e31939cebfb6d85f21dfbf7b94ec076.zip
staging: vt6655: Rename function MACvReceive0 and add parameter
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>
Diffstat (limited to 'drivers/staging/vt6655')
-rw-r--r--drivers/staging/vt6655/device_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 59056425ba3b..5b4d3d7e1a0b 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -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)