From: Stafford Horne <shorne@gmail.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
Stafford Horne <shorne@gmail.com>,
Jonas Bonn <jonas@southpole.se>,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
Andrew Morton <akpm@linux-foundation.org>,
Mike Rapoport <rppt@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Palmer Dabbelt <palmer@dabbelt.com>,
openrisc@lists.librecores.org
Subject: [PATCH v3 1/6] openrisc: io: Fixup defines and move include to the end
Date: Sun, 9 Aug 2020 08:06:42 +0900 [thread overview]
Message-ID: <20200808230647.833047-2-shorne@gmail.com> (raw)
In-Reply-To: <20200808230647.833047-1-shorne@gmail.com>
This didn't seem to cause any issues, but while working on fixing up
sparse annotations for OpenRISC I noticed this. This patch moves the
include of asm-generic/io.h to the end of the file. Also, we add
defines of ioremap and iounmap, that way we don't get duplicate
definitions from asm-generic/io.h.
Signed-off-by: Stafford Horne <shorne@gmail.com>
---
Changes since v2:
- none
Changes since v1:
- Add linux/types.h include following report from kbuild
arch/openrisc/include/asm/io.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h
index db02fb2077d9..7d6b4a77b379 100644
--- a/arch/openrisc/include/asm/io.h
+++ b/arch/openrisc/include/asm/io.h
@@ -14,6 +14,8 @@
#ifndef __ASM_OPENRISC_IO_H
#define __ASM_OPENRISC_IO_H
+#include <linux/types.h>
+
/*
* PCI: can we really do 0 here if we have no port IO?
*/
@@ -25,9 +27,12 @@
#define PIO_OFFSET 0
#define PIO_MASK 0
-#include <asm-generic/io.h>
-
+#define ioremap ioremap
void __iomem *ioremap(phys_addr_t offset, unsigned long size);
+
+#define iounmap iounmap
extern void iounmap(void *addr);
+#include <asm-generic/io.h>
+
#endif
--
2.26.2
next prev parent reply other threads:[~2020-08-08 23:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-08 23:06 [PATCH v3 0/6] OpenRISC header and sparse warning fixes for 5.9 Stafford Horne
2020-08-08 23:06 ` Stafford Horne [this message]
2020-08-08 23:06 ` [PATCH v3 2/6] openrisc: uaccess: Fix sparse address space warnings Stafford Horne
2020-08-08 23:06 ` [PATCH v3 3/6] openrisc: uaccess: Use static inline function in access_ok Stafford Horne
2020-08-08 23:06 ` [PATCH v3 4/6] openrisc: uaccess: Remove unused macro __addr_ok Stafford Horne
2020-08-08 23:06 ` [PATCH v3 5/6] openrisc: signal: Fix sparse address space warnings Stafford Horne
2020-08-08 23:06 ` [PATCH v3 6/6] openrisc: uaccess: Add user address space check to access_ok Stafford Horne
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=20200808230647.833047-2-shorne@gmail.com \
--to=shorne@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=luc.vanoostenryck@gmail.com \
--cc=openrisc@lists.librecores.org \
--cc=palmer@dabbelt.com \
--cc=rppt@kernel.org \
--cc=stefan.kristiansson@saunalahti.fi \
/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).