diff options
| author |   Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2022-08-28 08:53:29 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-08-30 17:17:48 +0200 |
| commit | 52b735c96aab0e1753fe268f2985633608502bce (patch) | |
| tree | 7e0599e445b00e26609d9de369a64f542ee86658 /drivers/staging/vt6655 | |
| parent | staging: vt6655: Remove declaration of s_vCalculateOFDMRParameter (diff) | |
| download | linux-dev-52b735c96aab0e1753fe268f2985633608502bce.tar.xz linux-dev-52b735c96aab0e1753fe268f2985633608502bce.zip | |
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>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/card.c | 10 | ||||
| -rw-r--r-- | drivers/staging/vt6655/mac.h | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index bbe05d9538a1..6711743dcf4a 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 a75cd318ee25..b6c4f2bb096a 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) |