staging: vt6655: Convert macro MACvSetBBType to function

Convert macro to static function. Multiline macros are not liked by
kernel community. Rename variable dwOrgValue to reg_value and byTyp to
mask 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/bd512f940427615ed4b134dd04f14095875eec5b.1661666677.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index bbe05d9538a1483cf956e78f07e2a852b76c239b..6711743dcf4ae0acc25c87b9bb4837321a3095cc 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -55,6 +55,16 @@ static const unsigned short cwRXBCNTSFOff[MAX_RATE] = {
 
 /*---------------------  Static Functions  --------------------------*/
 
+static void MACvSetBBType(void __iomem *iobase, u32 mask)
+{
+       u32 reg_value;
+
+       reg_value = ioread32(iobase + MAC_REG_ENCFG);
+       reg_value = reg_value & ~ENCFG_BBTYPE_MASK;
+       reg_value = reg_value | mask;
+       iowrite32(reg_value, iobase + MAC_REG_ENCFG);
+}
+
 /*---------------------  Export Functions  --------------------------*/
 
 /*

diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index a75cd318ee25545750acdc9852aa24ba94c9b1c3..b6c4f2bb096a1d34af1eae95a5df59dadccfedd9 100644 (file)
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -543,15 +543,6 @@
 #define MACvSelectPage1(iobase)                                \
        iowrite8(1, iobase + MAC_REG_PAGE1SEL)
 
-#define MACvSetBBType(iobase, byTyp)                                   \
-do {                                                                   \
-       unsigned long dwOrgValue;                                       \
-       dwOrgValue = ioread32(iobase + MAC_REG_ENCFG);                  \
-       dwOrgValue = dwOrgValue & ~ENCFG_BBTYPE_MASK;                   \
-       dwOrgValue = dwOrgValue | (unsigned long)byTyp;                 \
-       iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG);             \
-} while (0)
-
 #define MACvSetRFLE_LatchBase(iobase)                                 \
        vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)