From: Hector Martin <marcan@marcan.st>
To: soc@kernel.org
Cc: Arnd Bergmann <arnd@kernel.org>, Hector Martin <marcan@marcan.st>
Subject: [PATCH] asm-generic/io.h: Unbork ioremap_np() declaration
Date: Fri, 9 Apr 2021 14:20:38 +0900 [thread overview]
Message-ID: <20210409052038.58925-1-marcan@marcan.st> (raw)
It accidentally slipped into the #ifdef for ioremap_uc().
Signed-off-by: Hector Martin <marcan@marcan.st>
---
include/asm-generic/io.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 082e0c96db6e..76d456c516a1 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -995,6 +995,7 @@ static inline void __iomem *ioremap_uc(phys_addr_t offset, size_t size)
{
return NULL;
}
+#endif
/*
* ioremap_np needs an explicit architecture implementation, as it
@@ -1013,8 +1014,6 @@ static inline void __iomem *ioremap_np(phys_addr_t offset, size_t size)
}
#endif
-#endif
-
#ifdef CONFIG_HAS_IOPORT_MAP
#ifndef CONFIG_GENERIC_IOMAP
#ifndef ioport_map
--
2.30.0
next reply other threads:[~2021-04-09 5:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 5:20 Hector Martin [this message]
2021-04-09 7:16 ` [PATCH] asm-generic/io.h: Unbork ioremap_np() declaration Arnd Bergmann
2021-04-09 7:50 ` patchwork-bot+linux-soc
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=20210409052038.58925-1-marcan@marcan.st \
--to=marcan@marcan.st \
--cc=arnd@kernel.org \
--cc=soc@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.