>From 4626600abe69c86a3f029360c37f7fda1107e78a Mon Sep 17 00:00:00 2001 Message-Id: <4626600abe69c86a3f029360c37f7fda1107e78a.1675753094.git.gurumeharrachaputi@gmail.com> In-Reply-To: References: From: Guru Mehar Rachaputi Date: Sun, 5 Feb 2023 00:52:13 +0100 Subject: [PATCH v2 2/4] staging: vt6655: Macro with braces issue change to inline function This patch is to fix checkpatch warning: "Macro argument 'iobase' may be better as '(iobase)' to avoid precedence issues changed to inline function. Signed-off-by: Guru Mehar Rachaputi --- Changes in v2: - Macros with one statement that calls 'iowrite8' function changed to inline function as reviewed by gregkh@linuxfoundation.org. In relation to this, names of the callers of macro are modified to call this function. --- drivers/staging/vt6655/card.c | 5 +++-- drivers/staging/vt6655/channel.c | 4 ++-- drivers/staging/vt6655/device_main.c | 12 ++++++------ drivers/staging/vt6655/mac.c | 8 ++++---- drivers/staging/vt6655/mac.h | 12 +++++++++--- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index c680925b9c92..a6ff496b01b6 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -545,7 +545,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) spin_lock_irqsave(&priv->lock, flags); /* Set to Page1 */ - VT6655_MAC_SELECT_PAGE1(priv->port_offset); + vt6655_mac_select_page1(priv->port_offset); /* RSPINF_b_1 */ vnt_get_phy_field(priv, 14, @@ -643,7 +643,8 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) &byRsvTime); iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPINF_A_72); /* Set to Page0 */ - VT6655_MAC_SELECT_PAGE0(priv->port_offset); + vt6655_mac_select_page0(priv->port_offset); + spin_unlock_irqrestore(&priv->lock, flags); } diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c index 4122875ebcaa..e9a44bcebe32 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -116,12 +116,12 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) spin_lock_irqsave(&priv->lock, flags); /* set HW default power register */ - VT6655_MAC_SELECT_PAGE1(priv->port_offset); + vt6655_mac_select_page1(priv->port_offset); RFbSetPower(priv, RATE_1M, priv->byCurrentCh); iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK); RFbSetPower(priv, RATE_6M, priv->byCurrentCh); iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWROFDM); - VT6655_MAC_SELECT_PAGE0(priv->port_offset); + vt6655_mac_select_page0(priv->port_offset); spin_unlock_irqrestore(&priv->lock, flags); } diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 45e5eccadb44..beb31a55abe1 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -400,11 +400,11 @@ static void device_init_registers(struct vnt_private *priv) } if (priv->local_id > REV_ID_VT3253_B1) { - VT6655_MAC_SELECT_PAGE1(priv->port_offset); + vt6655_mac_select_page1(priv->port_offset); iowrite8(MSRCTL1_TXPWR | MSRCTL1_CSAPAREN, priv->port_offset + MAC_REG_MSRCTL + 1); - VT6655_MAC_SELECT_PAGE0(priv->port_offset); + vt6655_mac_select_page0(priv->port_offset); } /* use relative tx timeout and 802.11i D4 */ @@ -1586,21 +1586,21 @@ static void vnt_configure(struct ieee80211_hw *hw, spin_lock_irqsave(&priv->lock, flags); if (priv->mc_list_count > 2) { - VT6655_MAC_SELECT_PAGE1(priv->port_offset); + vt6655_mac_select_page1(priv->port_offset); iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0); iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0 + 4); - VT6655_MAC_SELECT_PAGE0(priv->port_offset); + vt6655_mac_select_page0(priv->port_offset); } else { - VT6655_MAC_SELECT_PAGE1(priv->port_offset); + vt6655_mac_select_page1(priv->port_offset); multicast = le64_to_cpu(multicast); iowrite32((u32)multicast, priv->port_offset + MAC_REG_MAR0); iowrite32((u32)(multicast >> 32), priv->port_offset + MAC_REG_MAR0 + 4); - VT6655_MAC_SELECT_PAGE0(priv->port_offset); + vt6655_mac_select_page0(priv->port_offset); } spin_unlock_irqrestore(&priv->lock, flags); diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index b4ebc7d31961..357df6031adb 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -188,13 +188,13 @@ static void vt6655_mac_save_context(struct vnt_private *priv, u8 *cxt_buf) /* read page0 register */ memcpy_fromio(cxt_buf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0); - VT6655_MAC_SELECT_PAGE1(io_base); + vt6655_mac_select_page1(io_base); /* read page1 register */ memcpy_fromio(cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, io_base, MAC_MAX_CONTEXT_SIZE_PAGE1); - VT6655_MAC_SELECT_PAGE0(io_base); + vt6655_mac_select_page0(io_base); } /* @@ -215,12 +215,12 @@ static void vt6655_mac_restore_context(struct vnt_private *priv, u8 *cxt_buf) { void __iomem *io_base = priv->port_offset; - VT6655_MAC_SELECT_PAGE1(io_base); + vt6655_mac_select_page1(io_base); /* restore page1 */ memcpy_toio(io_base, cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, MAC_MAX_CONTEXT_SIZE_PAGE1); - VT6655_MAC_SELECT_PAGE0(io_base); + vt6655_mac_select_page0(io_base); /* restore RCR,TCR,IMR... */ memcpy_toio(io_base + MAC_REG_RCR, cxt_buf + MAC_REG_RCR, diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index a33af2852227..b9a7ca0fe604 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,9 +537,15 @@ /*--------------------- Export Macros ------------------------------*/ -#define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, (iobase) + MAC_REG_PAGE1SEL) - -#define VT6655_MAC_SELECT_PAGE1(iobase) iowrite8(1, (iobase) + MAC_REG_PAGE1SEL) +static inline void vt6655_mac_select_page0(void __iomem *iobase) +{ + iowrite8(0, iobase + MAC_REG_PAGE1SEL); +} + +static inline void vt6655_mac_select_page1(void __iomem *iobase) +{ + iowrite8(1, iobase + MAC_REG_PAGE1SEL); +} #define MAKEWORD(lb, hb) \ ((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8))) -- 2.34.1