diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-13 08:11:46 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-11-11 21:18:19 +0100 |
| commit | 98c90e5ea34e98bdd4bcb67c48a0bdfd59bcd6cd (patch) | |
| tree | d30d6eaa8530f6d7021fbfe5d035266d04e5afbb /arch/sh | |
| parent | 3f3ded99aecf3498ac9a976ec2b02cf5c6281bd4 (diff) | |
sh: remove __iounmap
No need to indirect iounmap for sh.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/io.h | 9 | ||||
| -rw-r--r-- | arch/sh/mm/ioremap.c | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index ac0561960c52..1495489225ac 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -267,7 +267,7 @@ unsigned long long poke_real_address_q(unsigned long long addr, #ifdef CONFIG_MMU void __iomem *__ioremap_caller(phys_addr_t offset, unsigned long size, pgprot_t prot, void *caller); -void __iounmap(void __iomem *addr); +void iounmap(void __iomem *addr); static inline void __iomem * __ioremap(phys_addr_t offset, unsigned long size, pgprot_t prot) @@ -328,7 +328,7 @@ __ioremap_mode(phys_addr_t offset, unsigned long size, pgprot_t prot) #else #define __ioremap(offset, size, prot) ((void __iomem *)(offset)) #define __ioremap_mode(offset, size, prot) ((void __iomem *)(offset)) -#define __iounmap(addr) do { } while (0) +#define iounmap(addr) do { } while (0) #endif /* CONFIG_MMU */ static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size) @@ -370,11 +370,6 @@ static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; } #define ioremap_nocache ioremap #define ioremap_uc ioremap -static inline void iounmap(void __iomem *addr) -{ - __iounmap(addr); -} - /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c index d09ddfe58fd8..f6d02246d665 100644 --- a/arch/sh/mm/ioremap.c +++ b/arch/sh/mm/ioremap.c @@ -103,7 +103,7 @@ static inline int iomapping_nontranslatable(unsigned long offset) return 0; } -void __iounmap(void __iomem *addr) +void iounmap(void __iomem *addr) { unsigned long vaddr = (unsigned long __force)addr; struct vm_struct *p; @@ -134,4 +134,4 @@ void __iounmap(void __iomem *addr) kfree(p); } -EXPORT_SYMBOL(__iounmap); +EXPORT_SYMBOL(iounmap); |