staging: vt6655: Convert macro MACvReceive0 to function

Convert macro to static function. Multiline macros are not liked by
kernel community. Rename variable dwData to reg_value to avoid
CamelCase which is not accepted by checkpatch.pl. Change variable
declaration to u32 as this improves readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/059aca149bd0c1d75df4fb3cd8a177aa4948fb02.1659080988.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index bab08a40fe6691997dbd3c8131e57a6c02eac8f2..59056425ba3bdbaf401958dd2616444fe13a145a 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -205,6 +205,17 @@ 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)
+{
+       u32 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 0122c4603c6646882a71d1480500300f5aa75e9d..d21313f3067eaf140cade67a4d4466baffcb0b5c 100644 (file)
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -537,16 +537,6 @@
 
 /*---------------------  Export Macros ------------------------------*/
 
-#define MACvReceive0(iobase)                                           \
-do {                                                                   \
-       unsigned long dwData;                                           \
-       dwData = ioread32(iobase + MAC_REG_RXDMACTL0);                  \
-       if (dwData & 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 dwData;                                           \