From: Philipp Hortmann Date: Sun, 28 Aug 2022 06:53:29 +0000 (+0200) Subject: staging: vt6655: Convert macro MACvSetBBType to function X-Git-Tag: v6.1-rc5~261^2~143 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52b735c96aab0e1753fe268f2985633608502bce;p=platform%2Fkernel%2Flinux-starfive.git 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 Link: https://lore.kernel.org/r/bd512f940427615ed4b134dd04f14095875eec5b.1661666677.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index bbe05d9..6711743 100644 --- 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 a75cd31..b6c4f2b 100644 --- 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)