Commit 1795826c authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

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: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/e5ca6208263d5aa3f1d6f0359fa602187d799f19.1659080988.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9665eaf5

drivers/staging/vt6655/device_main.c

+6 −6
Original line number Diff line number Diff line
@@ -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)