[PATCH 3/7] staging: vt6655: Convert macro vt6655_mac_dma_ctl to function

From: Philipp Hortmann
Date: Sun Jul 17 2022 - 18:20:31 EST


Convert macro vt6655_mac_dma_ctl to function.
checkpatch.pl does not accept multiline macros.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx>
---
drivers/staging/vt6655/device_main.c | 13 +++++++++++++
drivers/staging/vt6655/mac.h | 10 ----------
2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 6525b7baf644..cf25644f8671 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -125,6 +125,8 @@ static void device_print_info(struct vnt_private *priv);
static void vt6655_mac_write_bssid_addr(void __iomem *iobase, const u8 *mac_addr);
static void vt6655_mac_read_ether_addr(void __iomem *iobase, u8 *mac_addr);

+static void vt6655_mac_dma_ctl(void __iomem *iobase);
+
static int device_init_rd0_ring(struct vnt_private *priv);
static int device_init_rd1_ring(struct vnt_private *priv);
static int device_init_td0_ring(struct vnt_private *priv);
@@ -205,6 +207,17 @@ static void vt6655_mac_read_ether_addr(void __iomem *iobase, u8 *mac_addr)
iowrite8(0, iobase + MAC_REG_PAGE1SEL);
}

+static void vt6655_mac_dma_ctl(void __iomem *iobase)
+{
+ unsigned long reg_value;
+
+ reg_value = ioread32(iobase + MAC_REG_RXDMACTL0);
+ if (reg_value & DMACTL_RUN)
+ iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL0);
+ else
+ iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL0);
+}
+
/*
* Initialisation of MAC & BBP registers
*/
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 60e0f980bcc5..5747de436911 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -537,16 +537,6 @@

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

-#define vt6655_mac_dma_ctl(iobase) \
-do { \
- unsigned long reg_value; \
- reg_value = ioread32(iobase + MAC_REG_RXDMACTL0); \
- if (reg_value & DMACTL_RUN) \
- iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL0); \
- else \
- iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL0); \
-} while (0)
-
#define MACvReceive1(iobase) \
do { \
unsigned long reg_value; \
--
2.37.1