diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-12 23:27:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-10 10:30:11 +0200 |
| commit | 7fc351505b4bd9dd5e48cf8f1183eade39c5764c (patch) | |
| tree | 43f07708d59802460e675f0187553853a30ce1cd | |
| parent | e06a89985c585fb5f5e0448bf4a166de416777f8 (diff) | |
| download | linux-stable-7fc351505b4bd9dd5e48cf8f1183eade39c5764c.tar.gz linux-stable-7fc351505b4bd9dd5e48cf8f1183eade39c5764c.tar.bz2 linux-stable-7fc351505b4bd9dd5e48cf8f1183eade39c5764c.zip | |
hexagon: clean up ioremap
commit ac32292c8552f7e8517be184e65dd09786e991f9 upstream.
Use ioremap as the main implemented function, and defined
ioremap_nocache to it as a deprecated alias.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/hexagon/include/asm/io.h | 11 | ||||
| -rw-r--r-- | arch/hexagon/kernel/hexagon_ksyms.c | 2 | ||||
| -rw-r--r-- | arch/hexagon/mm/ioremap.c | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h index e17262ad125e..fbce50040e74 100644 --- a/arch/hexagon/include/asm/io.h +++ b/arch/hexagon/include/asm/io.h @@ -186,16 +186,9 @@ static inline void writel(u32 data, volatile void __iomem *addr) #define mmiowb() -/* - * Need an mtype somewhere in here, for cache type deals? - * This is probably too long for an inline. - */ -void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size); +void __iomem *ioremap(unsigned long phys_addr, unsigned long size); +#define ioremap_nocache ioremap -static inline void __iomem *ioremap(unsigned long phys_addr, unsigned long size) -{ - return ioremap_nocache(phys_addr, size); -} static inline void iounmap(volatile void __iomem *addr) { diff --git a/arch/hexagon/kernel/hexagon_ksyms.c b/arch/hexagon/kernel/hexagon_ksyms.c index aa248f595431..d13d4a06ee38 100644 --- a/arch/hexagon/kernel/hexagon_ksyms.c +++ b/arch/hexagon/kernel/hexagon_ksyms.c @@ -33,7 +33,7 @@ EXPORT_SYMBOL(__vmgetie); EXPORT_SYMBOL(__vmsetie); EXPORT_SYMBOL(__vmyield); EXPORT_SYMBOL(empty_zero_page); -EXPORT_SYMBOL(ioremap_nocache); +EXPORT_SYMBOL(ioremap); EXPORT_SYMBOL(memcpy); EXPORT_SYMBOL(memset); diff --git a/arch/hexagon/mm/ioremap.c b/arch/hexagon/mm/ioremap.c index d27d67224046..370ade265e58 100644 --- a/arch/hexagon/mm/ioremap.c +++ b/arch/hexagon/mm/ioremap.c @@ -22,7 +22,7 @@ #include <linux/vmalloc.h> #include <linux/mm.h> -void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size) +void __iomem *ioremap(unsigned long phys_addr, unsigned long size) { unsigned long last_addr, addr; unsigned long offset = phys_addr & ~PAGE_MASK; |