[PATCH 3/3] staging: vt6655: Convert macro vt6655_mac_clear_stck_ds to function

From: Philipp Hortmann
Date: Wed Jul 20 2022 - 12:25:05 EST


Convert once used macro to static function.
Multiline macros are not liked by kernel community.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx>
---
drivers/staging/vt6655/mac.c | 11 +++++++++++
drivers/staging/vt6655/mac.h | 8 --------
2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index d7ee42df7062..3e9494c653dc 100644
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -38,6 +38,8 @@

#include "mac.h"

+static void vt6655_mac_clear_stck_ds(void __iomem *iobase);
+
void vt6655_mac_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask)
{
unsigned char reg_value;
@@ -70,6 +72,15 @@ void vt6655_mac_word_reg_bits_off(void __iomem *iobase, const u8 reg_offset, con
iowrite16(reg_value & ~(bit_mask), iobase + reg_offset);
}

+static void vt6655_mac_clear_stck_ds(void __iomem *iobase)
+{
+ unsigned char reg_value;
+
+ reg_value = ioread8(iobase + MAC_REG_STICKHW);
+ reg_value = reg_value & 0xFC;
+ iowrite8(reg_value, iobase + MAC_REG_STICKHW);
+}
+
/*
* Description:
* Test if all test bits off
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index c2c9cb07f32d..467c599a3289 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -537,14 +537,6 @@

/*--------------------- Export Macros ------------------------------*/

-#define vt6655_mac_clear_stck_ds(iobase) \
-do { \
- unsigned char reg_value; \
- reg_value = ioread8(iobase + MAC_REG_STICKHW); \
- reg_value = reg_value & 0xFC; \
- iowrite8(reg_value, iobase + MAC_REG_STICKHW); \
-} while (0)
-
#define MACvSelectPage0(iobase) \
iowrite8(0, iobase + MAC_REG_PAGE1SEL)

--
2.37.1