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 2/4] sh: remove unused __BUILD_IOPORT_SINGLE 'pfx' parameter
Date: Fri, 21 Oct 2022 15:24:22 -0500 [thread overview]
Message-ID: <20221021202424.307531-3-helgaas@kernel.org> (raw)
In-Reply-To: <20221021202424.307531-1-helgaas@kernel.org>
From: Bjorn Helgaas <bhelgaas@google.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@google.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
next prev parent reply other threads:[~2022-10-21 20:24 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 ` Bjorn Helgaas [this message]
2022-10-21 20:24 ` [PATCH 3/4] sh: remove unnecessary __BUILD_IOPORT_PFX() Bjorn Helgaas
2022-10-21 20:24 ` [PATCH 4/4] sh: remove unnecessary __BUILD_MEMORY_STRING() 'pfx' parameter Bjorn Helgaas
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-3-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
all inboxes | Powered by JetHome®