diff options
author | Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2022-07-29 10:14:14 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-08-16 15:09:55 +0200 |
commit | 9665eaf50ab32f9f0bdcc546a27e94ee19e235bd (patch) | |
tree | bcb135642d3c1ed55404164be906aeeba08838b4 | |
parent | 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff) | |
download | linux-9665eaf50ab32f9f0bdcc546a27e94ee19e235bd.tar.gz linux-9665eaf50ab32f9f0bdcc546a27e94ee19e235bd.tar.bz2 linux-9665eaf50ab32f9f0bdcc546a27e94ee19e235bd.zip |
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>
-rw-r--r-- | drivers/staging/vt6655/device_main.c | 11 | ||||
-rw-r--r-- | drivers/staging/vt6655/mac.h | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index bab08a40fe66..59056425ba3b 100644 --- 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 0122c4603c66..d21313f3067e 100644 --- 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; \ |