aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655
diff options
context:
space:
mode:
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>2022-07-04 20:21:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-07-08 14:28:47 +0200
commit7b5ec68ac1947929cc40e60d3748c1e6b6144682 (patch)
treeaa1f3185c0847b89fbab7942426d9b2ec448db78 /drivers/staging/vt6655
parentstaging: vt6655: Convert macro vt6655_mac_write_bssid_addr to function (diff)
downloadlinux-dev-7b5ec68ac1947929cc40e60d3748c1e6b6144682.tar.xz
linux-dev-7b5ec68ac1947929cc40e60d3748c1e6b6144682.zip
staging: vt6655: Convert macro vt6655_mac_read_ether_addr to function
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>
Diffstat (limited to 'drivers/staging/vt6655')
-rw-r--r--drivers/staging/vt6655/device_main.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 025a53b493d3..298963cbca1d 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -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