From: Bjorn Helgaas <helgaas@kernel.org>
To: Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>
Cc: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>
Subject: [PATCH 4/4] sh: remove unnecessary __BUILD_MEMORY_STRING() 'pfx' parameter
Date: Fri, 21 Oct 2022 15:24:24 -0500 [thread overview]
Message-ID: <20221021202424.307531-5-helgaas@kernel.org> (raw)
In-Reply-To: <20221021202424.307531-1-helgaas@kernel.org>
From: Bjorn Helgaas <bhelgaas@google.com>
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@google.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
--
2.25.1
prev parent reply other threads:[~2022-10-21 20:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-21 20:24 [PATCH REPOST v2 0/4] sh: remove unused SLOW_DOWN_IO Bjorn Helgaas
2022-10-21 20:24 ` [PATCH 1/4] " Bjorn Helgaas
2022-10-21 20:24 ` [PATCH 2/4] sh: remove unused __BUILD_IOPORT_SINGLE 'pfx' parameter Bjorn Helgaas
2022-10-21 20:24 ` [PATCH 3/4] sh: remove unnecessary __BUILD_IOPORT_PFX() Bjorn Helgaas
2022-10-21 20:24 ` Bjorn Helgaas [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221021202424.307531-5-helgaas@kernel.org \
--to=helgaas@kernel.org \
--cc=bhelgaas@google.com \
--cc=dalias@libc.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).