| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <b4a04608b3900186d4941b3bfe9463bb79e261e8.1656835310.git.philipp.g.hortmann@gmail.com>
Date: Mon, 4 Jul 2022 20:20:52 +0200
From: Philipp Hortmann <philipp.g.hortmann@...il.com>
To: Forest Bond <forest@...ttletooquiet.net>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
linux-staging@...ts.linux.dev, linux-kernel@...r.kernel.org
Subject: [PATCH 4/6] staging: vt6655: Move two macros to file where those are
used
Move two multiline macros to file of only useage to
convert them later to static functions.
checkpatch.pl does not accept multiline macros.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@...il.com>
---
drivers/staging/vt6655/device_main.c | 24 ++++++++++++++++++++++++
drivers/staging/vt6655/mac.h | 24 ------------------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index b9c57c661729..fdb653071918 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -186,6 +186,30 @@ device_set_options(struct vnt_private *priv)
pr_debug(" byBBType= %d\n", (int)priv->byBBType);
}
+#define vt6655_mac_write_bssid_addr(iobase, mac_addr) \
+do { \
+ iowrite8(1, iobase + MAC_REG_PAGE1SEL); \
+ iowrite8(mac_addr[0], iobase + MAC_REG_BSSID0); \
+ iowrite8(mac_addr[1], iobase + MAC_REG_BSSID0 + 1); \
+ iowrite8(mac_addr[2], iobase + MAC_REG_BSSID0 + 2); \
+ iowrite8(mac_addr[3], iobase + MAC_REG_BSSID0 + 3); \
+ iowrite8(mac_addr[4], iobase + MAC_REG_BSSID0 + 4); \
+ iowrite8(mac_addr[5], iobase + MAC_REG_BSSID0 + 5); \
+ iowrite8(0, iobase + MAC_REG_PAGE1SEL); \
+} while (0)
+
+#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)
+
/*
* Initialisation of MAC & BBP registers
*/
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index ba5575d63db0..5c14a76ed799 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -565,30 +565,6 @@ do { \
iowrite16(wData & ~(wBits), iobase + byRegOfs); \
} while (0)
-#define vt6655_mac_write_bssid_addr(iobase, mac_addr) \
-do { \
- iowrite8(1, iobase + MAC_REG_PAGE1SEL); \
- iowrite8(mac_addr[0], iobase + MAC_REG_BSSID0); \
- iowrite8(mac_addr[1], iobase + MAC_REG_BSSID0 + 1); \
- iowrite8(mac_addr[2], iobase + MAC_REG_BSSID0 + 2); \
- iowrite8(mac_addr[3], iobase + MAC_REG_BSSID0 + 3); \
- iowrite8(mac_addr[4], iobase + MAC_REG_BSSID0 + 4); \
- iowrite8(mac_addr[5], iobase + MAC_REG_BSSID0 + 5); \
- iowrite8(0, iobase + MAC_REG_PAGE1SEL); \
-} while (0)
-
-#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)
-
#define MACvReceive0(iobase) \
do { \
unsigned long dwData; \
--
2.36.1
Powered by blists - more mailing lists