From: Christoph Hellwig <hch@lst.de> To: Yoshinori Sato <ysato@users.sourceforge.jp>, Rich Felker <dalias@libc.org> Cc: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] sh: move ioremap_fixed details out of <asm/io.h> Date: Fri, 26 Jun 2020 08:07:11 +0000 [thread overview] Message-ID: <20200626080717.1999041-5-hch@lst.de> (raw) In-Reply-To: <20200626080717.1999041-1-hch@lst.de> ioremap_fixed is an internal implementation detail and should not be exposed to drivers. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/sh/include/asm/io.h | 16 ---------------- arch/sh/mm/init.c | 1 + arch/sh/mm/ioremap.c | 1 + arch/sh/mm/ioremap.h | 23 +++++++++++++++++++++++ arch/sh/mm/ioremap_fixed.c | 1 + 5 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 arch/sh/mm/ioremap.h diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 1fd06ef6a19454..357a7e0c86d682 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -346,22 +346,6 @@ ioremap_prot(phys_addr_t offset, unsigned long size, unsigned long flags) } #endif -#ifdef CONFIG_IOREMAP_FIXED -extern void __iomem *ioremap_fixed(phys_addr_t, unsigned long, pgprot_t); -extern int iounmap_fixed(void __iomem *); -extern void ioremap_fixed_init(void); -#else -static inline void __iomem * -ioremap_fixed(phys_addr_t phys_addr, unsigned long size, pgprot_t prot) -{ - BUG(); - return NULL; -} - -static inline void ioremap_fixed_init(void) { } -static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; } -#endif - #define ioremap_uc ioremap /* diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index a70ba0fdd0b382..da7ea48f9439e2 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -28,6 +28,7 @@ #include <asm/setup.h> #include <asm/cache.h> #include <linux/sizes.h> +#include "ioremap.h" pgd_t swapper_pg_dir[PTRS_PER_PGD]; diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c index f6d02246d665bd..d9ec85b6bb2130 100644 --- a/arch/sh/mm/ioremap.c +++ b/arch/sh/mm/ioremap.c @@ -24,6 +24,7 @@ #include <asm/cacheflush.h> #include <asm/tlbflush.h> #include <asm/mmu.h> +#include "ioremap.h" /* * Remap an arbitrary physical address space into the kernel virtual diff --git a/arch/sh/mm/ioremap.h b/arch/sh/mm/ioremap.h new file mode 100644 index 00000000000000..f2544e721a3526 --- /dev/null +++ b/arch/sh/mm/ioremap.h @@ -0,0 +1,23 @@ +#ifndef _SH_MM_IORMEMAP_H +#define _SH_MM_IORMEMAP_H 1 + +#ifdef CONFIG_IOREMAP_FIXED +void __iomem *ioremap_fixed(phys_addr_t, unsigned long, pgprot_t); +int iounmap_fixed(void __iomem *); +void ioremap_fixed_init(void); +#else +static inline void __iomem * +ioremap_fixed(phys_addr_t phys_addr, unsigned long size, pgprot_t prot) +{ + BUG(); + return NULL; +} +static inline void ioremap_fixed_init(void) +{ +} +static inline int iounmap_fixed(void __iomem *addr) +{ + return -EINVAL; +} +#endif /* CONFIG_IOREMAP_FIXED */ +#endif /* _SH_MM_IORMEMAP_H */ diff --git a/arch/sh/mm/ioremap_fixed.c b/arch/sh/mm/ioremap_fixed.c index 07e744d75fa01b..1914b79d1c530b 100644 --- a/arch/sh/mm/ioremap_fixed.c +++ b/arch/sh/mm/ioremap_fixed.c @@ -24,6 +24,7 @@ #include <asm/tlbflush.h> #include <asm/mmu.h> #include <asm/mmu_context.h> +#include "ioremap.h" struct ioremap_map { void __iomem *addr; -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Yoshinori Sato <ysato@users.sourceforge.jp>, Rich Felker <dalias@libc.org> Cc: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] sh: move ioremap_fixed details out of <asm/io.h> Date: Fri, 26 Jun 2020 10:07:11 +0200 [thread overview] Message-ID: <20200626080717.1999041-5-hch@lst.de> (raw) In-Reply-To: <20200626080717.1999041-1-hch@lst.de> ioremap_fixed is an internal implementation detail and should not be exposed to drivers. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/sh/include/asm/io.h | 16 ---------------- arch/sh/mm/init.c | 1 + arch/sh/mm/ioremap.c | 1 + arch/sh/mm/ioremap.h | 23 +++++++++++++++++++++++ arch/sh/mm/ioremap_fixed.c | 1 + 5 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 arch/sh/mm/ioremap.h diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 1fd06ef6a19454..357a7e0c86d682 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -346,22 +346,6 @@ ioremap_prot(phys_addr_t offset, unsigned long size, unsigned long flags) } #endif -#ifdef CONFIG_IOREMAP_FIXED -extern void __iomem *ioremap_fixed(phys_addr_t, unsigned long, pgprot_t); -extern int iounmap_fixed(void __iomem *); -extern void ioremap_fixed_init(void); -#else -static inline void __iomem * -ioremap_fixed(phys_addr_t phys_addr, unsigned long size, pgprot_t prot) -{ - BUG(); - return NULL; -} - -static inline void ioremap_fixed_init(void) { } -static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; } -#endif - #define ioremap_uc ioremap /* diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index a70ba0fdd0b382..da7ea48f9439e2 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -28,6 +28,7 @@ #include <asm/setup.h> #include <asm/cache.h> #include <linux/sizes.h> +#include "ioremap.h" pgd_t swapper_pg_dir[PTRS_PER_PGD]; diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c index f6d02246d665bd..d9ec85b6bb2130 100644 --- a/arch/sh/mm/ioremap.c +++ b/arch/sh/mm/ioremap.c @@ -24,6 +24,7 @@ #include <asm/cacheflush.h> #include <asm/tlbflush.h> #include <asm/mmu.h> +#include "ioremap.h" /* * Remap an arbitrary physical address space into the kernel virtual diff --git a/arch/sh/mm/ioremap.h b/arch/sh/mm/ioremap.h new file mode 100644 index 00000000000000..f2544e721a3526 --- /dev/null +++ b/arch/sh/mm/ioremap.h @@ -0,0 +1,23 @@ +#ifndef _SH_MM_IORMEMAP_H +#define _SH_MM_IORMEMAP_H 1 + +#ifdef CONFIG_IOREMAP_FIXED +void __iomem *ioremap_fixed(phys_addr_t, unsigned long, pgprot_t); +int iounmap_fixed(void __iomem *); +void ioremap_fixed_init(void); +#else +static inline void __iomem * +ioremap_fixed(phys_addr_t phys_addr, unsigned long size, pgprot_t prot) +{ + BUG(); + return NULL; +} +static inline void ioremap_fixed_init(void) +{ +} +static inline int iounmap_fixed(void __iomem *addr) +{ + return -EINVAL; +} +#endif /* CONFIG_IOREMAP_FIXED */ +#endif /* _SH_MM_IORMEMAP_H */ diff --git a/arch/sh/mm/ioremap_fixed.c b/arch/sh/mm/ioremap_fixed.c index 07e744d75fa01b..1914b79d1c530b 100644 --- a/arch/sh/mm/ioremap_fixed.c +++ b/arch/sh/mm/ioremap_fixed.c @@ -24,6 +24,7 @@ #include <asm/tlbflush.h> #include <asm/mmu.h> #include <asm/mmu_context.h> +#include "ioremap.h" struct ioremap_map { void __iomem *addr; -- 2.26.2
next prev parent reply other threads:[~2020-06-26 8:07 UTC|newest] Thread overview: 163+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-24 16:26 ioremap and dma cleanups and fixes for superh Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-03-24 16:26 ` [PATCH 01/10] sh: remove -Werror from Makefiles Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-03-24 16:26 ` [PATCH 02/10] sh: sort the selects for SUPERH alphabetically Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-03-24 16:26 ` [PATCH 03/10] sh: remove __KERNEL__ ifdefs from non-UAPI headers Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-03-24 16:26 ` [PATCH 04/10] sh: move ioremap_fixed details out of <asm/io.h> Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-03-24 16:26 ` [PATCH 05/10] sh: move the ioremap implementation out of line Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-03-24 16:26 ` [PATCH 06/10] sh: don't include <asm/io_trapped.h> in <asm/io.h> Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-03-24 16:26 ` [PATCH 07/10] sh: unexport register_trapped_io and match_trapped_io_handler Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-03-24 16:26 ` [PATCH 08/10] dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-03-24 16:26 ` [PATCH 09/10] sh: don't allow non-coherent DMA for NOMMU Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-03-24 16:26 ` [PATCH 10/10] sh: use the generic dma coherent remap allocator Christoph Hellwig 2020-03-24 16:26 ` Christoph Hellwig 2020-06-26 8:07 ` ioremap and dma cleanups and fixes for superh (resend) Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig 2020-06-26 8:07 ` [PATCH 01/10] sh: remove -Werror from Makefiles Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig 2020-06-26 8:07 ` [PATCH 02/10] sh: sort the selects for SUPERH alphabetically Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig 2020-06-26 8:07 ` [PATCH 03/10] sh: remove __KERNEL__ ifdefs from non-UAPI headers Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig [this message] 2020-06-26 8:07 ` [PATCH 04/10] sh: move ioremap_fixed details out of <asm/io.h> Christoph Hellwig 2020-06-26 8:07 ` [PATCH 05/10] sh: move the ioremap implementation out of line Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig 2020-06-26 8:07 ` [PATCH 06/10] sh: don't include <asm/io_trapped.h> in <asm/io.h> Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig 2020-06-26 8:07 ` [PATCH 07/10] sh: unexport register_trapped_io and match_trapped_io_handler Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig 2020-06-26 8:07 ` [PATCH 08/10] dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig 2020-06-26 8:07 ` [PATCH 09/10] sh: don't allow non-coherent DMA for NOMMU Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig 2020-06-28 0:53 ` Rob Landley 2020-06-28 1:01 ` Rob Landley 2020-06-28 7:24 ` Christoph Hellwig 2020-06-28 7:24 ` Christoph Hellwig 2020-06-26 8:07 ` [PATCH 10/10] sh: use the generic dma coherent remap allocator Christoph Hellwig 2020-06-26 8:07 ` Christoph Hellwig 2020-07-14 12:18 ` ioremap and dma cleanups and fixes for superh (2nd resend) Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-07-14 12:18 ` [PATCH 01/10] sh: remove -Werror from Makefiles Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-07-14 12:18 ` [PATCH 02/10] sh: sort the selects for SUPERH alphabetically Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-07-14 12:18 ` [PATCH 03/10] sh: remove __KERNEL__ ifdefs from non-UAPI headers Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-07-14 12:18 ` [PATCH 04/10] sh: move ioremap_fixed details out of <asm/io.h> Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-07-14 12:18 ` [PATCH 05/10] sh: move the ioremap implementation out of line Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-07-14 12:18 ` [PATCH 06/10] sh: don't include <asm/io_trapped.h> in <asm/io.h> Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-07-14 12:18 ` [PATCH 07/10] sh: unexport register_trapped_io and match_trapped_io_handler Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-07-14 12:18 ` [PATCH 08/10] dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-07-21 3:17 ` Rich Felker 2020-07-21 3:17 ` Rich Felker 2020-07-21 5:11 ` Christoph Hellwig 2020-07-21 5:11 ` Christoph Hellwig 2020-07-22 0:43 ` Rich Felker 2020-07-22 0:43 ` Rich Felker 2020-07-14 12:18 ` [PATCH 09/10] sh: don't allow non-coherent DMA for NOMMU Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-08-28 2:00 ` Rich Felker 2020-08-28 2:00 ` Rich Felker 2020-08-28 2:11 ` Rich Felker 2020-08-28 2:11 ` Rich Felker 2020-08-28 4:24 ` Christoph Hellwig 2020-08-28 4:24 ` Christoph Hellwig 2020-08-28 9:26 ` Ulf Hansson 2020-08-28 9:26 ` Ulf Hansson 2020-08-28 15:09 ` Rich Felker 2020-08-28 15:09 ` Rich Felker 2020-08-29 8:31 ` Christoph Hellwig 2020-08-29 8:31 ` Christoph Hellwig 2020-08-31 11:28 ` Ulf Hansson 2020-08-31 11:28 ` Ulf Hansson 2020-07-14 12:18 ` [PATCH 10/10] sh: use the generic dma coherent remap allocator Christoph Hellwig 2020-07-14 12:18 ` Christoph Hellwig 2020-07-14 12:31 ` ioremap and dma cleanups and fixes for superh (2nd resend) John Paul Adrian Glaubitz 2020-07-14 12:31 ` John Paul Adrian Glaubitz 2020-07-14 15:59 ` Rich Felker 2020-07-14 15:59 ` Rich Felker 2020-07-14 16:10 ` John Paul Adrian Glaubitz 2020-07-14 16:10 ` John Paul Adrian Glaubitz 2020-07-14 23:12 ` John Paul Adrian Glaubitz 2020-07-14 23:12 ` John Paul Adrian Glaubitz 2020-07-14 23:14 ` John Paul Adrian Glaubitz 2020-07-14 23:14 ` John Paul Adrian Glaubitz 2020-07-15 3:12 ` Rich Felker 2020-07-15 3:12 ` Rich Felker 2020-07-15 6:39 ` John Paul Adrian Glaubitz 2020-07-15 6:39 ` John Paul Adrian Glaubitz 2020-07-15 7:27 ` Geert Uytterhoeven 2020-07-15 7:27 ` Geert Uytterhoeven 2020-07-15 7:37 ` John Paul Adrian Glaubitz 2020-07-15 7:37 ` John Paul Adrian Glaubitz 2020-07-15 8:06 ` Geert Uytterhoeven 2020-07-15 8:06 ` Geert Uytterhoeven 2020-07-15 7:46 ` John Paul Adrian Glaubitz 2020-07-15 7:46 ` John Paul Adrian Glaubitz 2020-07-15 7:51 ` John Paul Adrian Glaubitz 2020-07-15 8:11 ` Geert Uytterhoeven 2020-07-15 8:11 ` Geert Uytterhoeven 2020-07-15 8:27 ` John Paul Adrian Glaubitz 2020-07-15 8:27 ` John Paul Adrian Glaubitz 2020-07-15 14:37 ` John Paul Adrian Glaubitz 2020-07-15 14:37 ` John Paul Adrian Glaubitz 2020-07-15 15:39 ` John Paul Adrian Glaubitz 2020-07-15 15:39 ` John Paul Adrian Glaubitz 2020-07-15 16:18 ` John Paul Adrian Glaubitz 2020-07-15 16:18 ` John Paul Adrian Glaubitz 2020-07-15 18:21 ` Geert Uytterhoeven 2020-07-15 18:21 ` Geert Uytterhoeven 2020-07-15 18:27 ` John Paul Adrian Glaubitz 2020-07-15 18:27 ` John Paul Adrian Glaubitz 2020-07-16 9:40 ` Peter Zijlstra 2020-07-16 9:40 ` Peter Zijlstra 2020-07-16 10:05 ` John Paul Adrian Glaubitz 2020-07-16 10:05 ` John Paul Adrian Glaubitz 2020-07-16 10:29 ` peterz 2020-07-16 10:29 ` peterz 2020-07-16 10:54 ` John Paul Adrian Glaubitz 2020-07-16 10:54 ` John Paul Adrian Glaubitz 2020-07-16 11:01 ` peterz 2020-07-16 11:01 ` peterz 2020-07-16 11:03 ` John Paul Adrian Glaubitz 2020-07-16 11:03 ` John Paul Adrian Glaubitz 2020-07-16 11:37 ` peterz 2020-07-16 11:37 ` peterz 2020-07-16 12:04 ` peterz 2020-07-16 12:04 ` peterz 2020-07-16 18:14 ` John Paul Adrian Glaubitz 2020-07-16 18:14 ` John Paul Adrian Glaubitz 2020-07-16 19:28 ` Peter Zijlstra 2020-07-16 19:28 ` Peter Zijlstra 2020-07-16 19:33 ` John Paul Adrian Glaubitz 2020-07-16 19:33 ` John Paul Adrian Glaubitz 2020-07-16 11:30 ` John Paul Adrian Glaubitz 2020-07-16 11:30 ` John Paul Adrian Glaubitz 2020-07-15 8:07 ` Geert Uytterhoeven 2020-07-15 8:07 ` Geert Uytterhoeven 2020-07-16 11:31 ` John Paul Adrian Glaubitz 2020-07-16 11:31 ` John Paul Adrian Glaubitz 2020-07-20 13:38 ` Christoph Hellwig 2020-07-20 13:38 ` Christoph Hellwig 2020-07-20 13:42 ` John Paul Adrian Glaubitz 2020-07-20 13:42 ` John Paul Adrian Glaubitz 2020-07-20 14:53 ` Rich Felker 2020-07-20 14:53 ` Rich Felker 2020-07-21 3:20 ` Rich Felker 2020-07-21 3:20 ` Rich Felker
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=20200626080717.1999041-5-hch@lst.de \ --to=hch@lst.de \ --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: linkBe 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.