[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20221021-wip-bjorn-22-10-slow-down-io-v2-4-8b3692d12ea7@google.com>
Date: Fri, 21 Oct 2022 14:36:58 -0500
From: Bjorn Helgaas <bhelgaas@...gle.com>
To: Rich Felker <dalias@...c.org>,
Yoshinori Sato <ysato@...rs.sourceforge.jp>,
linux-sh@...r.kernel.org, linux-kernel@...r.kernel.org,
Bjorn Helgaas <bhelgaas@...gle.com>
Subject: [PATCH v2 4/4] sh: remove unnecessary __BUILD_MEMORY_STRING() 'pfx'
parameter
Previously __BUILD_MEMORY_STRING() accepted a "pfx" parameter, to which all
users passed "__raw_". Simplify this by dropping the parameter and
encoding "__raw_" in the function name explicitly.
Signed-off-by: Bjorn Helgaas <bhelgaas@...gle.com>
---
arch/sh/include/asm/io.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index e29e8870dc3b..179420fc4053 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -86,11 +86,11 @@ __BUILD_UNCACHED_IO(w, u16)
__BUILD_UNCACHED_IO(l, u32)
__BUILD_UNCACHED_IO(q, u64)
-#define __BUILD_MEMORY_STRING(pfx, bwlq, type) \
+#define __BUILD_MEMORY_STRING(bwlq, type) \
\
static inline void \
-pfx##writes##bwlq(volatile void __iomem *mem, const void *addr, \
- unsigned int count) \
+__raw_writes##bwlq(volatile void __iomem *mem, const void *addr, \
+ unsigned int count) \
{ \
const volatile type *__addr = addr; \
\
@@ -100,8 +100,8 @@ pfx##writes##bwlq(volatile void __iomem *mem, const void *addr, \
} \
} \
\
-static inline void pfx##reads##bwlq(volatile void __iomem *mem, \
- void *addr, unsigned int count) \
+static inline void __raw_reads##bwlq(volatile void __iomem *mem, \
+ void *addr, unsigned int count) \
{ \
volatile type *__addr = addr; \
\
@@ -111,13 +111,13 @@ static inline void pfx##reads##bwlq(volatile void __iomem *mem, \
} \
}
-__BUILD_MEMORY_STRING(__raw_, b, u8)
-__BUILD_MEMORY_STRING(__raw_, w, u16)
+__BUILD_MEMORY_STRING(b, u8)
+__BUILD_MEMORY_STRING(w, u16)
void __raw_writesl(void __iomem *addr, const void *data, int longlen);
void __raw_readsl(const void __iomem *addr, void *data, int longlen);
-__BUILD_MEMORY_STRING(__raw_, q, u64)
+__BUILD_MEMORY_STRING(q, u64)
#ifdef CONFIG_HAS_IOPORT_MAP
--
b4 0.10.1
Powered by blists - more mailing lists