From: Philipp Hortmann Date: Sun, 7 Aug 2022 18:13:55 +0000 (+0200) Subject: staging: vt6655: Convert macro MACvDisableBarkerPreambleMd X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=692f9007ab0e597eb59aac1db9a2a2ce4b6297c7;p=linux.git staging: vt6655: Convert macro MACvDisableBarkerPreambleMd Convert macro MACvDisableBarkerPreambleMd to static function which calls the common static function vt6655_mac_clear_bits. This saves codelines and multiline macros are not liked by kernel community. Function name is also changed to avoid CamelCase which is not accepted by checkpatch.pl and to clean up namespace. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/2a1d67762d9ecf3f30f3e293ad6ab997ad278b84.1659892671.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 46bd88ee46688..8e2a976aaaad4 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -248,6 +248,12 @@ static void vt6655_mac_en_barker_preamble_md(void __iomem *iobase) { vt6655_mac_set_bits(iobase, ENCFG_BARKERPREAM); } + +static void vt6655_mac_dis_barker_preamble_md(void __iomem *iobase) +{ + vt6655_mac_clear_bits(iobase, ENCFG_BARKERPREAM); +} + /* * Initialisation of MAC & BBP registers */ @@ -1486,7 +1492,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, vt6655_mac_en_barker_preamble_md(priv->port_offset); priv->preamble_type = true; } else { - MACvDisableBarkerPreambleMd(priv->port_offset); + vt6655_mac_dis_barker_preamble_md(priv->port_offset); priv->preamble_type = false; } } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3400ea15b673e..a75cd318ee255 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -543,14 +543,6 @@ #define MACvSelectPage1(iobase) \ iowrite8(1, iobase + MAC_REG_PAGE1SEL) -#define MACvDisableBarkerPreambleMd(iobase) \ -do { \ - unsigned long dwOrgValue; \ - dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ - dwOrgValue = dwOrgValue & ~ENCFG_BARKERPREAM; \ - iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG); \ -} while (0) - #define MACvSetBBType(iobase, byTyp) \ do { \ unsigned long dwOrgValue; \