2023-11-23 03:50:41

by Yuntao Wang

[permalink] [raw]
Subject: [PATCH] x86: Remove the unused bw parameter from the BUILDIO macro

The commit 1e8f93e18379 ("x86: Consolidate port I/O helpers") moved some
port I/O helpers to <asm/shared/io.h>, which caused the bw parameter in the
BUILDIO macro to be unused. Remove it.

Signed-off-by: Yuntao Wang <[email protected]>
---
arch/x86/include/asm/io.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 76238842406a..3814a9263d64 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -242,7 +242,7 @@ static inline void slow_down_io(void)

#endif

-#define BUILDIO(bwl, bw, type) \
+#define BUILDIO(bwl, type) \
static inline void out##bwl##_p(type value, u16 port) \
{ \
out##bwl(value, port); \
@@ -288,9 +288,9 @@ static inline void ins##bwl(u16 port, void *addr, unsigned long count) \
} \
}

-BUILDIO(b, b, u8)
-BUILDIO(w, w, u16)
-BUILDIO(l, , u32)
+BUILDIO(b, u8)
+BUILDIO(w, u16)
+BUILDIO(l, u32)
#undef BUILDIO

#define inb_p inb_p
--
2.43.0


Subject: [tip: x86/cleanups] x86/io: Remove the unused 'bw' parameter from the BUILDIO() macro

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: 03f111710af9ea9cd5a08ecc98e456d1cc0c2284
Gitweb: https://git.kernel.org/tip/03f111710af9ea9cd5a08ecc98e456d1cc0c2284
Author: Yuntao Wang <[email protected]>
AuthorDate: Thu, 23 Nov 2023 11:49:11 +08:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Thu, 23 Nov 2023 10:57:36 +01:00

x86/io: Remove the unused 'bw' parameter from the BUILDIO() macro

Commit 1e8f93e18379 ("x86: Consolidate port I/O helpers") moved some
port I/O helpers to <asm/shared/io.h>, which caused the 'bw' parameter
in the BUILDIO() macro to become unused. Remove it.

Signed-off-by: Yuntao Wang <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/include/asm/io.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 7623884..3814a92 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -242,7 +242,7 @@ static inline void slow_down_io(void)

#endif

-#define BUILDIO(bwl, bw, type) \
+#define BUILDIO(bwl, type) \
static inline void out##bwl##_p(type value, u16 port) \
{ \
out##bwl(value, port); \
@@ -288,9 +288,9 @@ static inline void ins##bwl(u16 port, void *addr, unsigned long count) \
} \
}

-BUILDIO(b, b, u8)
-BUILDIO(w, w, u16)
-BUILDIO(l, , u32)
+BUILDIO(b, u8)
+BUILDIO(w, u16)
+BUILDIO(l, u32)
#undef BUILDIO

#define inb_p inb_p