[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20221021202424.307531-3-helgaas@kernel.org>
Date: Fri, 21 Oct 2022 15:24:22 -0500
From: Bjorn Helgaas <helgaas@...nel.org>
To: Yoshinori Sato <ysato@...rs.sourceforge.jp>,
Rich Felker <dalias@...c.org>
Cc: linux-sh@...r.kernel.org, linux-kernel@...r.kernel.org,
Bjorn Helgaas <bhelgaas@...gle.com>
Subject: [PATCH 2/4] sh: remove unused __BUILD_IOPORT_SINGLE 'pfx' parameter
From: Bjorn Helgaas <bhelgaas@...gle.com>
Previously __BUILD_IOPORT_SINGLE() accepted a "pfx" parameter, to which
__BUILD_IOPORT_PFX(), the only user of __BUILD_IOPORT_SINGLE(), passed
along its own "bus" parameter. But users of __BUILD_IOPORT_PFX() supplied
nothing, so both "bus" and "pfx" are pointless. Remove them.
Signed-off-by: Bjorn Helgaas <bhelgaas@...gle.com>
---
arch/sh/include/asm/io.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 8043b7c235ca..193640bd9563 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -140,9 +140,9 @@ static inline void __set_io_port_base(unsigned long pbase)
extern void __iomem *__ioport_map(unsigned long addr, unsigned int size);
#endif
-#define __BUILD_IOPORT_SINGLE(pfx, bwlq, type, p) \
+#define __BUILD_IOPORT_SINGLE(bwlq, type, p) \
\
-static inline void pfx##out##bwlq##p(type val, unsigned long port) \
+static inline void out##bwlq##p(type val, unsigned long port) \
{ \
volatile type *__addr; \
\
@@ -150,7 +150,7 @@ static inline void pfx##out##bwlq##p(type val, unsigned long port) \
*__addr = val; \
} \
\
-static inline type pfx##in##bwlq##p(unsigned long port) \
+static inline type in##bwlq##p(unsigned long port) \
{ \
volatile type *__addr; \
type __val; \
@@ -161,12 +161,12 @@ static inline type pfx##in##bwlq##p(unsigned long port) \
return __val; \
}
-#define __BUILD_IOPORT_PFX(bus, bwlq, type) \
- __BUILD_IOPORT_SINGLE(bus, bwlq, type,) \
- __BUILD_IOPORT_SINGLE(bus, bwlq, type, _p)
+#define __BUILD_IOPORT_PFX(bwlq, type) \
+ __BUILD_IOPORT_SINGLE(bwlq, type,) \
+ __BUILD_IOPORT_SINGLE(bwlq, type, _p)
#define BUILDIO_IOPORT(bwlq, type) \
- __BUILD_IOPORT_PFX(, bwlq, type)
+ __BUILD_IOPORT_PFX(bwlq, type)
BUILDIO_IOPORT(b, u8)
BUILDIO_IOPORT(w, u16)
--
2.25.1
Powered by blists - more mailing lists