Commit 05e778f0 authored Jul 29, 2022 by Philipp Hortmann Committed by Greg Kroah-Hartman Aug 16, 2022

staging: vt6655: Replace MACvTransmitAC0 with function vt6655_mac_dma_ctl

Convert macro MACvTransmitAC0 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/013abd177d9ac129c034776f10cdf823fd87d781.1659080988.git.philipp.g.hortmann@gmail.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 59cce3f4

drivers/staging/vt6655/device_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1229,7 +1229,7 @@ static int vnt_tx_packet(struct vnt_private priv, struct sk_buff skb)
		wmb(); /* second memory barrier */

		if (head_td->td_info->flags & TD_FLAGS_NETIF_SKB)
		MACvTransmitAC0(priv->port_offset);
		vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_AC0DMACTL);
		else
		vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_TXDMACTL0);

drivers/staging/vt6655/mac.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -537,16 +537,6 @@

		/--------------------- Export Macros ------------------------------/

		#define MACvTransmitAC0(iobase) \
		do { \
		unsigned long dwData; \
		dwData = ioread32(iobase + MAC_REG_AC0DMACTL); \
		if (dwData & DMACTL_RUN) \
		iowrite32(DMACTL_WAKE, iobase + MAC_REG_AC0DMACTL); \
		else \
		iowrite32(DMACTL_RUN, iobase + MAC_REG_AC0DMACTL); \
		} while (0)

		#define MACvSelectPage0(iobase) \
		iowrite8(0, iobase + MAC_REG_PAGE1SEL)