From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from conuserg-07.nifty.com ([210.131.2.74]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jVc2N-0003Li-Os for barebox@lists.infradead.org; Mon, 04 May 2020 14:25:48 +0000 From: Masahiro Yamada Date: Mon, 4 May 2020 23:24:55 +0900 Message-Id: <20200504142455.404658-4-masahiroy@kernel.org> In-Reply-To: <20200504142455.404658-1-masahiroy@kernel.org> References: <20200504142455.404658-1-masahiroy@kernel.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 4/4] common.h: move the generic IOMEM definition to asm-generic/io.h To: barebox@lists.infradead.org Cc: Masahiro Yamada arch/mips/include/asm/io.h defines arch-specific IOMEM(). The generic definition of IOMEM() should go to asm-generic/io.h because it is a collection of fallback defaults when there is no specific definition in . Signed-off-by: Masahiro Yamada --- include/asm-generic/io.h | 4 ++++ include/common.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 973b8b954..76e6d0dc1 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -420,4 +420,8 @@ static inline void iowrite64be(u64 value, volatile void __iomem *addr) #endif #endif /* CONFIG_64BIT */ +#ifndef IOMEM +#define IOMEM(addr) ((void __force __iomem *)(addr)) +#endif + #endif /* __ASM_GENERIC_IO_H */ diff --git a/include/common.h b/include/common.h index 0bf819a6f..ce16ff83a 100644 --- a/include/common.h +++ b/include/common.h @@ -135,8 +135,4 @@ const char *barebox_get_hostname(void); void barebox_set_hostname(const char *); void barebox_set_hostname_no_overwrite(const char *); -#ifndef IOMEM -#define IOMEM(addr) ((void __force __iomem *)(addr)) -#endif - #endif /* __COMMON_H_ */ -- 2.25.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox