staging: vt6655: Convert macro vt6655_mac_read_ether_addr to function
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Mon, 4 Jul 2022 18:21:08 +0000 (20:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Jul 2022 12:28:47 +0000 (14:28 +0200)
Convert macro vt6655_mac_read_ether_addr to static function.
checkpatch.pl does not accept multiline macros.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/2e2524187d9d3a6140fe4a5a35926db14dddfe98.1656835310.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/device_main.c

index 025a53b..298963c 100644 (file)
@@ -123,6 +123,7 @@ static void device_free_info(struct vnt_private *priv);
 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 int device_init_rd0_ring(struct vnt_private *priv);
 static int device_init_rd1_ring(struct vnt_private *priv);
@@ -200,17 +201,17 @@ static void vt6655_mac_write_bssid_addr(void __iomem *iobase, const u8 *mac_addr
        iowrite8(0, iobase + MAC_REG_PAGE1SEL);
 }
 
-#define vt6655_mac_read_ether_addr(iobase, mac_addr)           \
-do {                                                           \
-       iowrite8(1, iobase + MAC_REG_PAGE1SEL);                 \
-       mac_addr[0] = ioread8(iobase + MAC_REG_PAR0);           \
-       mac_addr[1] = ioread8(iobase + MAC_REG_PAR0 + 1);       \
-       mac_addr[2] = ioread8(iobase + MAC_REG_PAR0 + 2);       \
-       mac_addr[3] = ioread8(iobase + MAC_REG_PAR0 + 3);       \
-       mac_addr[4] = ioread8(iobase + MAC_REG_PAR0 + 4);       \
-       mac_addr[5] = ioread8(iobase + MAC_REG_PAR0 + 5);       \
-       iowrite8(0, iobase + MAC_REG_PAGE1SEL);                 \
-} while (0)
+static void vt6655_mac_read_ether_addr(void __iomem *iobase, u8 *mac_addr)
+{
+       iowrite8(1, iobase + MAC_REG_PAGE1SEL);
+       mac_addr[0] = ioread8(iobase + MAC_REG_PAR0);
+       mac_addr[1] = ioread8(iobase + MAC_REG_PAR0 + 1);
+       mac_addr[2] = ioread8(iobase + MAC_REG_PAR0 + 2);
+       mac_addr[3] = ioread8(iobase + MAC_REG_PAR0 + 3);
+       mac_addr[4] = ioread8(iobase + MAC_REG_PAR0 + 4);
+       mac_addr[5] = ioread8(iobase + MAC_REG_PAR0 + 5);
+       iowrite8(0, iobase + MAC_REG_PAGE1SEL);
+}
 
 /*
  * Initialisation of MAC & BBP registers