diff for duplicates of <cover.1675753094.git.gurumeharrachaputi@gmail.com> diff --git a/a/1.txt b/N1/1.txt index eb659b9..4cdf9e2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,3 @@ - This patch is to fix checkpatch warning: "Macro argument 'iobase' may be better as '(iobase)' to avoid precedence issues" changed to inline function. In relation to this, names of the callers of macro are also modified to call diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..5f0c77e --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,3 @@ +Content-Type: text/x-diff; charset=us-ascii +Content-Disposition: attachment; + filename="0001-staging-vt6655-Add-braces-to-macro-parameter-iobase.patch" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..f15f09c --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,35 @@ +From 447c10de599e3434fb6c012cdfc2cc8e4b5c839b Mon Sep 17 00:00:00 2001 +Message-Id: <447c10de599e3434fb6c012cdfc2cc8e4b5c839b.1675753094.git.gurumeharrachaputi@gmail.com> +In-Reply-To: <cover.1675753094.git.gurumeharrachaputi@gmail.com> +References: <cover.1675753094.git.gurumeharrachaputi@gmail.com> +From: Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com> +Date: Sat, 4 Feb 2023 04:34:38 +0100 +Subject: [PATCH v2 1/4] staging: vt6655: Add braces to macro parameter + 'iobase' + +This patch is to fix checkpatch warning: "Macro argument 'iobase' may be better +as '(iobase)' to avoid precedence issues. + +Signed-off-by: Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com> +--- + drivers/staging/vt6655/mac.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h +index acf931c3f5fd..a33af2852227 100644 +--- a/drivers/staging/vt6655/mac.h ++++ b/drivers/staging/vt6655/mac.h +@@ -537,9 +537,9 @@ + + /*--------------------- Export Macros ------------------------------*/ + +-#define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, iobase + MAC_REG_PAGE1SEL) ++#define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, (iobase) + MAC_REG_PAGE1SEL) + +-#define VT6655_MAC_SELECT_PAGE1(iobase) iowrite8(1, iobase + MAC_REG_PAGE1SEL) ++#define VT6655_MAC_SELECT_PAGE1(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 diff --git a/N1/3.hdr b/N1/3.hdr new file mode 100644 index 0000000..2a2fe22 --- /dev/null +++ b/N1/3.hdr @@ -0,0 +1,3 @@ +Content-Type: text/x-diff; charset=us-ascii +Content-Disposition: attachment; + filename="0002-staging-vt6655-Macro-with-braces-issue-change-to-inl.patch" diff --git a/N1/3.txt b/N1/3.txt new file mode 100644 index 0000000..72550f2 --- /dev/null +++ b/N1/3.txt @@ -0,0 +1,173 @@ +From 4626600abe69c86a3f029360c37f7fda1107e78a Mon Sep 17 00:00:00 2001 +Message-Id: <4626600abe69c86a3f029360c37f7fda1107e78a.1675753094.git.gurumeharrachaputi@gmail.com> +In-Reply-To: <cover.1675753094.git.gurumeharrachaputi@gmail.com> +References: <cover.1675753094.git.gurumeharrachaputi@gmail.com> +From: Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com> +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 <gurumeharrachaputi@gmail.com> +--- +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 diff --git a/N1/4.hdr b/N1/4.hdr new file mode 100644 index 0000000..1727542 --- /dev/null +++ b/N1/4.hdr @@ -0,0 +1,3 @@ +Content-Type: text/x-diff; charset=us-ascii +Content-Disposition: attachment; + filename="0003-staging-vt6655-Macro-with-braces-issue-change-to-inl.patch" diff --git a/N1/4.txt b/N1/4.txt new file mode 100644 index 0000000..9cd3ed3 --- /dev/null +++ b/N1/4.txt @@ -0,0 +1,76 @@ +From 2288b803515a781f0829c8e07e96e6cbe827ff4e Mon Sep 17 00:00:00 2001 +Message-Id: <2288b803515a781f0829c8e07e96e6cbe827ff4e.1675753094.git.gurumeharrachaputi@gmail.com> +In-Reply-To: <cover.1675753094.git.gurumeharrachaputi@gmail.com> +References: <cover.1675753094.git.gurumeharrachaputi@gmail.com> +From: Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com> +Date: Sun, 5 Feb 2023 13:40:42 +0100 +Subject: [PATCH v2 3/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 <gurumeharrachaputi@gmail.com> +--- +Changes in v3: + - Whitespace error from checkpatch fixed + +Changes in v2: + - Macros with one statement that is to call 'iowrite8' function changed + to inline function as reviewed by gregkh@linuxfoundation.org. + In relation to this, names of the callers of macro are also modified + to call this function. +--- + drivers/staging/vt6655/card.c | 3 +-- + drivers/staging/vt6655/channel.c | 2 +- + drivers/staging/vt6655/mac.h | 4 ++-- + 3 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c +index a6ff496b01b6..d2d122dc16d8 100644 +--- a/drivers/staging/vt6655/card.c ++++ b/drivers/staging/vt6655/card.c +@@ -643,8 +643,7 @@ 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 e9a44bcebe32..60b445c38424 100644 +--- a/drivers/staging/vt6655/channel.c ++++ b/drivers/staging/vt6655/channel.c +@@ -121,7 +121,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) + 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/mac.h b/drivers/staging/vt6655/mac.h +index b9a7ca0fe604..ae3064303691 100644 +--- a/drivers/staging/vt6655/mac.h ++++ b/drivers/staging/vt6655/mac.h +@@ -539,12 +539,12 @@ + + static inline void vt6655_mac_select_page0(void __iomem *iobase) + { +- iowrite8(0, iobase + MAC_REG_PAGE1SEL); ++ iowrite8(0, iobase + MAC_REG_PAGE1SEL); + } + + static inline void vt6655_mac_select_page1(void __iomem *iobase) + { +- iowrite8(1, iobase + MAC_REG_PAGE1SEL); ++ iowrite8(1, iobase + MAC_REG_PAGE1SEL); + } + + #define MAKEWORD(lb, hb) \ +-- +2.34.1 diff --git a/N1/5.hdr b/N1/5.hdr new file mode 100644 index 0000000..51b8789 --- /dev/null +++ b/N1/5.hdr @@ -0,0 +1,3 @@ +Content-Type: text/x-diff; charset=us-ascii +Content-Disposition: attachment; + filename="0004-staging-vt6655-Macro-with-braces-issue-changed-to-in.patch" diff --git a/N1/5.txt b/N1/5.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/N1/5.txt @@ -0,0 +1 @@ + diff --git a/a/content_digest b/N1/content_digest index bc569aa..05959fc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,12 @@ "From\0Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com>\0" "Subject\0[PATCH v2 0/4] staging: vt6655: Macro with braces issue changed to inline function\0" - "Date\0Tue, 7 Feb 2023 08:14:26 +0100\0" + "Date\0Tue, 7 Feb 2023 09:40:37 +0100\0" "To\0Forest Bond <forest@alittletooquiet.net>" Greg Kroah-Hartman <gregkh@linuxfoundation.org> linux-staging@lists.linux.dev " linux-kernel@vger.kernel.org\0" - "\00:1\0" + "\01:1\0" "b\0" - "\n" "This patch is to fix checkpatch warning: \"Macro argument 'iobase' may be better\n" "as '(iobase)' to avoid precedence issues\" changed to inline function. In\n" "relation to this, names of the callers of macro are also modified to call\n" @@ -48,5 +47,301 @@ "-- \n" "Thanks & Regards,\n" Guru + "\01:2\0" + "fn\00001-staging-vt6655-Add-braces-to-macro-parameter-iobase.patch\0" + "b\0" + "From 447c10de599e3434fb6c012cdfc2cc8e4b5c839b Mon Sep 17 00:00:00 2001\n" + "Message-Id: <447c10de599e3434fb6c012cdfc2cc8e4b5c839b.1675753094.git.gurumeharrachaputi@gmail.com>\n" + "In-Reply-To: <cover.1675753094.git.gurumeharrachaputi@gmail.com>\n" + "References: <cover.1675753094.git.gurumeharrachaputi@gmail.com>\n" + "From: Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com>\n" + "Date: Sat, 4 Feb 2023 04:34:38 +0100\n" + "Subject: [PATCH v2 1/4] staging: vt6655: Add braces to macro parameter\n" + " 'iobase'\n" + "\n" + "This patch is to fix checkpatch warning: \"Macro argument 'iobase' may be better\n" + "as '(iobase)' to avoid precedence issues.\n" + "\n" + "Signed-off-by: Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com>\n" + "---\n" + " drivers/staging/vt6655/mac.h | 4 ++--\n" + " 1 file changed, 2 insertions(+), 2 deletions(-)\n" + "\n" + "diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h\n" + "index acf931c3f5fd..a33af2852227 100644\n" + "--- a/drivers/staging/vt6655/mac.h\n" + "+++ b/drivers/staging/vt6655/mac.h\n" + "@@ -537,9 +537,9 @@\n" + " \n" + " /*--------------------- Export Macros ------------------------------*/\n" + " \n" + "-#define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, iobase + MAC_REG_PAGE1SEL)\n" + "+#define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, (iobase) + MAC_REG_PAGE1SEL)\n" + " \n" + "-#define VT6655_MAC_SELECT_PAGE1(iobase) iowrite8(1, iobase + MAC_REG_PAGE1SEL)\n" + "+#define VT6655_MAC_SELECT_PAGE1(iobase) iowrite8(1, (iobase) + MAC_REG_PAGE1SEL)\n" + " \n" + " #define MAKEWORD(lb, hb) \\\n" + " \t((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8)))\n" + "-- \n" + 2.34.1 + "\01:3\0" + "fn\00002-staging-vt6655-Macro-with-braces-issue-change-to-inl.patch\0" + "b\0" + "From 4626600abe69c86a3f029360c37f7fda1107e78a Mon Sep 17 00:00:00 2001\n" + "Message-Id: <4626600abe69c86a3f029360c37f7fda1107e78a.1675753094.git.gurumeharrachaputi@gmail.com>\n" + "In-Reply-To: <cover.1675753094.git.gurumeharrachaputi@gmail.com>\n" + "References: <cover.1675753094.git.gurumeharrachaputi@gmail.com>\n" + "From: Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com>\n" + "Date: Sun, 5 Feb 2023 00:52:13 +0100\n" + "Subject: [PATCH v2 2/4] staging: vt6655: Macro with braces issue change to\n" + " inline function\n" + "\n" + "This patch is to fix checkpatch warning: \"Macro argument 'iobase' may be better\n" + "as '(iobase)' to avoid precedence issues changed to inline function.\n" + "\n" + "Signed-off-by: Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com>\n" + "---\n" + "Changes in v2:\n" + " - Macros with one statement that calls 'iowrite8' function changed\n" + " to inline function as reviewed by gregkh@linuxfoundation.org.\n" + "\tIn relation to this, names of the callers of macro are modified\n" + "\tto call this function.\n" + "---\n" + " drivers/staging/vt6655/card.c | 5 +++--\n" + " drivers/staging/vt6655/channel.c | 4 ++--\n" + " drivers/staging/vt6655/device_main.c | 12 ++++++------\n" + " drivers/staging/vt6655/mac.c | 8 ++++----\n" + " drivers/staging/vt6655/mac.h | 12 +++++++++---\n" + " 5 files changed, 24 insertions(+), 17 deletions(-)\n" + "\n" + "diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c\n" + "index c680925b9c92..a6ff496b01b6 100644\n" + "--- a/drivers/staging/vt6655/card.c\n" + "+++ b/drivers/staging/vt6655/card.c\n" + "@@ -545,7 +545,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)\n" + " \tspin_lock_irqsave(&priv->lock, flags);\n" + " \n" + " \t/* Set to Page1 */\n" + "-\tVT6655_MAC_SELECT_PAGE1(priv->port_offset);\n" + "+\tvt6655_mac_select_page1(priv->port_offset);\n" + " \n" + " \t/* RSPINF_b_1 */\n" + " \tvnt_get_phy_field(priv, 14,\n" + "@@ -643,7 +643,8 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)\n" + " \t\t\t\t &byRsvTime);\n" + " \tiowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPINF_A_72);\n" + " \t/* Set to Page0 */\n" + "-\tVT6655_MAC_SELECT_PAGE0(priv->port_offset);\n" + "+ vt6655_mac_select_page0(priv->port_offset);\n" + "+\n" + " \n" + " \tspin_unlock_irqrestore(&priv->lock, flags);\n" + " }\n" + "diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c\n" + "index 4122875ebcaa..e9a44bcebe32 100644\n" + "--- a/drivers/staging/vt6655/channel.c\n" + "+++ b/drivers/staging/vt6655/channel.c\n" + "@@ -116,12 +116,12 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)\n" + " \t\tspin_lock_irqsave(&priv->lock, flags);\n" + " \n" + " \t\t/* set HW default power register */\n" + "-\t\tVT6655_MAC_SELECT_PAGE1(priv->port_offset);\n" + "+\t\tvt6655_mac_select_page1(priv->port_offset);\n" + " \t\tRFbSetPower(priv, RATE_1M, priv->byCurrentCh);\n" + " \t\tiowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK);\n" + " \t\tRFbSetPower(priv, RATE_6M, priv->byCurrentCh);\n" + " \t\tiowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWROFDM);\n" + "-\t\tVT6655_MAC_SELECT_PAGE0(priv->port_offset);\n" + "+\t vt6655_mac_select_page0(priv->port_offset);\n" + " \n" + " \t\tspin_unlock_irqrestore(&priv->lock, flags);\n" + " \t}\n" + "diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c\n" + "index 45e5eccadb44..beb31a55abe1 100644\n" + "--- a/drivers/staging/vt6655/device_main.c\n" + "+++ b/drivers/staging/vt6655/device_main.c\n" + "@@ -400,11 +400,11 @@ static void device_init_registers(struct vnt_private *priv)\n" + " \t}\n" + " \n" + " \tif (priv->local_id > REV_ID_VT3253_B1) {\n" + "-\t\tVT6655_MAC_SELECT_PAGE1(priv->port_offset);\n" + "+\t\tvt6655_mac_select_page1(priv->port_offset);\n" + " \n" + " \t\tiowrite8(MSRCTL1_TXPWR | MSRCTL1_CSAPAREN, priv->port_offset + MAC_REG_MSRCTL + 1);\n" + " \n" + "-\t\tVT6655_MAC_SELECT_PAGE0(priv->port_offset);\n" + "+\t\tvt6655_mac_select_page0(priv->port_offset);\n" + " \t}\n" + " \n" + " \t/* use relative tx timeout and 802.11i D4 */\n" + "@@ -1586,21 +1586,21 @@ static void vnt_configure(struct ieee80211_hw *hw,\n" + " \t\t\tspin_lock_irqsave(&priv->lock, flags);\n" + " \n" + " \t\t\tif (priv->mc_list_count > 2) {\n" + "-\t\t\t\tVT6655_MAC_SELECT_PAGE1(priv->port_offset);\n" + "+\t\t\t\tvt6655_mac_select_page1(priv->port_offset);\n" + " \n" + " \t\t\t\tiowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0);\n" + " \t\t\t\tiowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0 + 4);\n" + " \n" + "-\t\t\t\tVT6655_MAC_SELECT_PAGE0(priv->port_offset);\n" + "+\t\t\t\tvt6655_mac_select_page0(priv->port_offset);\n" + " \t\t\t} else {\n" + "-\t\t\t\tVT6655_MAC_SELECT_PAGE1(priv->port_offset);\n" + "+\t\t\t\tvt6655_mac_select_page1(priv->port_offset);\n" + " \n" + " \t\t\t\tmulticast = le64_to_cpu(multicast);\n" + " \t\t\t\tiowrite32((u32)multicast, priv->port_offset + MAC_REG_MAR0);\n" + " \t\t\t\tiowrite32((u32)(multicast >> 32),\n" + " \t\t\t\t\t priv->port_offset + MAC_REG_MAR0 + 4);\n" + " \n" + "-\t\t\t\tVT6655_MAC_SELECT_PAGE0(priv->port_offset);\n" + "+\t\t\t\tvt6655_mac_select_page0(priv->port_offset);\n" + " \t\t\t}\n" + " \n" + " \t\t\tspin_unlock_irqrestore(&priv->lock, flags);\n" + "diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c\n" + "index b4ebc7d31961..357df6031adb 100644\n" + "--- a/drivers/staging/vt6655/mac.c\n" + "+++ b/drivers/staging/vt6655/mac.c\n" + "@@ -188,13 +188,13 @@ static void vt6655_mac_save_context(struct vnt_private *priv, u8 *cxt_buf)\n" + " \t/* read page0 register */\n" + " \tmemcpy_fromio(cxt_buf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0);\n" + " \n" + "-\tVT6655_MAC_SELECT_PAGE1(io_base);\n" + "+\tvt6655_mac_select_page1(io_base);\n" + " \n" + " \t/* read page1 register */\n" + " \tmemcpy_fromio(cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, io_base,\n" + " \t\t MAC_MAX_CONTEXT_SIZE_PAGE1);\n" + " \n" + "-\tVT6655_MAC_SELECT_PAGE0(io_base);\n" + "+\tvt6655_mac_select_page0(io_base);\n" + " }\n" + " \n" + " /*\n" + "@@ -215,12 +215,12 @@ static void vt6655_mac_restore_context(struct vnt_private *priv, u8 *cxt_buf)\n" + " {\n" + " \tvoid __iomem *io_base = priv->port_offset;\n" + " \n" + "-\tVT6655_MAC_SELECT_PAGE1(io_base);\n" + "+\tvt6655_mac_select_page1(io_base);\n" + " \t/* restore page1 */\n" + " \tmemcpy_toio(io_base, cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0,\n" + " \t\t MAC_MAX_CONTEXT_SIZE_PAGE1);\n" + " \n" + "-\tVT6655_MAC_SELECT_PAGE0(io_base);\n" + "+\tvt6655_mac_select_page0(io_base);\n" + " \n" + " \t/* restore RCR,TCR,IMR... */\n" + " \tmemcpy_toio(io_base + MAC_REG_RCR, cxt_buf + MAC_REG_RCR,\n" + "diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h\n" + "index a33af2852227..b9a7ca0fe604 100644\n" + "--- a/drivers/staging/vt6655/mac.h\n" + "+++ b/drivers/staging/vt6655/mac.h\n" + "@@ -537,9 +537,15 @@\n" + " \n" + " /*--------------------- Export Macros ------------------------------*/\n" + " \n" + "-#define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, (iobase) + MAC_REG_PAGE1SEL)\n" + "-\n" + "-#define VT6655_MAC_SELECT_PAGE1(iobase) iowrite8(1, (iobase) + MAC_REG_PAGE1SEL)\n" + "+static inline void vt6655_mac_select_page0(void __iomem *iobase)\n" + "+{\n" + "+ iowrite8(0, iobase + MAC_REG_PAGE1SEL);\n" + "+}\n" + "+\n" + "+static inline void vt6655_mac_select_page1(void __iomem *iobase)\n" + "+{\n" + "+ iowrite8(1, iobase + MAC_REG_PAGE1SEL);\n" + "+}\n" + " \n" + " #define MAKEWORD(lb, hb) \\\n" + " \t((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8)))\n" + "-- \n" + 2.34.1 + "\01:4\0" + "fn\00003-staging-vt6655-Macro-with-braces-issue-change-to-inl.patch\0" + "b\0" + "From 2288b803515a781f0829c8e07e96e6cbe827ff4e Mon Sep 17 00:00:00 2001\n" + "Message-Id: <2288b803515a781f0829c8e07e96e6cbe827ff4e.1675753094.git.gurumeharrachaputi@gmail.com>\n" + "In-Reply-To: <cover.1675753094.git.gurumeharrachaputi@gmail.com>\n" + "References: <cover.1675753094.git.gurumeharrachaputi@gmail.com>\n" + "From: Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com>\n" + "Date: Sun, 5 Feb 2023 13:40:42 +0100\n" + "Subject: [PATCH v2 3/4] staging: vt6655: Macro with braces issue change to\n" + " inline function\n" + "\n" + "This patch is to fix checkpatch warning: \"Macro argument 'iobase' may be better\n" + "as '(iobase)' to avoid precedence issues\" changed to inline function.\n" + "\n" + "Signed-off-by: Guru Mehar Rachaputi <gurumeharrachaputi@gmail.com>\n" + "---\n" + "Changes in v3:\n" + "\t- Whitespace error from checkpatch fixed\n" + "\n" + "Changes in v2:\n" + "\t- Macros with one statement that is to call 'iowrite8' function changed\n" + "\tto inline function as reviewed by gregkh@linuxfoundation.org.\n" + "\tIn relation to this, names of the callers of macro are also modified\n" + "\tto call this function.\n" + "---\n" + " drivers/staging/vt6655/card.c | 3 +--\n" + " drivers/staging/vt6655/channel.c | 2 +-\n" + " drivers/staging/vt6655/mac.h | 4 ++--\n" + " 3 files changed, 4 insertions(+), 5 deletions(-)\n" + "\n" + "diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c\n" + "index a6ff496b01b6..d2d122dc16d8 100644\n" + "--- a/drivers/staging/vt6655/card.c\n" + "+++ b/drivers/staging/vt6655/card.c\n" + "@@ -643,8 +643,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)\n" + " \t\t\t\t &byRsvTime);\n" + " \tiowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPINF_A_72);\n" + " \t/* Set to Page0 */\n" + "- vt6655_mac_select_page0(priv->port_offset);\n" + "-\n" + "+\tvt6655_mac_select_page0(priv->port_offset);\n" + " \n" + " \tspin_unlock_irqrestore(&priv->lock, flags);\n" + " }\n" + "diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c\n" + "index e9a44bcebe32..60b445c38424 100644\n" + "--- a/drivers/staging/vt6655/channel.c\n" + "+++ b/drivers/staging/vt6655/channel.c\n" + "@@ -121,7 +121,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)\n" + " \t\tiowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK);\n" + " \t\tRFbSetPower(priv, RATE_6M, priv->byCurrentCh);\n" + " \t\tiowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWROFDM);\n" + "-\t vt6655_mac_select_page0(priv->port_offset);\n" + "+\t\tvt6655_mac_select_page0(priv->port_offset);\n" + " \n" + " \t\tspin_unlock_irqrestore(&priv->lock, flags);\n" + " \t}\n" + "diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h\n" + "index b9a7ca0fe604..ae3064303691 100644\n" + "--- a/drivers/staging/vt6655/mac.h\n" + "+++ b/drivers/staging/vt6655/mac.h\n" + "@@ -539,12 +539,12 @@\n" + " \n" + " static inline void vt6655_mac_select_page0(void __iomem *iobase)\n" + " {\n" + "- iowrite8(0, iobase + MAC_REG_PAGE1SEL);\n" + "+\tiowrite8(0, iobase + MAC_REG_PAGE1SEL);\n" + " }\n" + " \n" + " static inline void vt6655_mac_select_page1(void __iomem *iobase)\n" + " {\n" + "- iowrite8(1, iobase + MAC_REG_PAGE1SEL);\n" + "+\tiowrite8(1, iobase + MAC_REG_PAGE1SEL);\n" + " }\n" + " \n" + " #define MAKEWORD(lb, hb) \\\n" + "-- \n" + 2.34.1 + "\01:5\0" + "fn\00004-staging-vt6655-Macro-with-braces-issue-changed-to-in.patch\0" + "b\0" -013d8e20ebf353a74e92259be8d1c986adbc9be33cffdefe28ad4d6388433118 +97a3870208d2cfb109fcc0f006f16fcecac5eae10a92104a120a2ad345f7475b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.