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 | 3f3ded99aecf3498ac9a976ec2b02cf5c6281bd4 (patch) | |
| tree | e75234c1dea72af5d9218e1e78cd04acc854a009 /arch/nios2 | |
| parent | 9425172ecd5df77bc3ba317484132f820ff6b1db (diff) | |
nios2: remove __iounmap
No need to indirect iounmap for nios2.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/nios2')
| -rw-r--r-- | arch/nios2/include/asm/io.h | 7 | ||||
| -rw-r--r-- | arch/nios2/mm/ioremap.c | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h index d108937c321e..746853ac7d8d 100644 --- a/arch/nios2/include/asm/io.h +++ b/arch/nios2/include/asm/io.h @@ -26,12 +26,7 @@ #define writel_relaxed(x, addr) writel(x, addr) void __iomem *ioremap(unsigned long physaddr, unsigned long size); -extern void __iounmap(void __iomem *addr); - -static inline void iounmap(void __iomem *addr) -{ - __iounmap(addr); -} +void iounmap(void __iomem *addr); /* Pages to physical address... */ #define page_to_phys(page) virt_to_phys(page_to_virt(page)) diff --git a/arch/nios2/mm/ioremap.c b/arch/nios2/mm/ioremap.c index 7a1a27f3daa3..b56af759dcdf 100644 --- a/arch/nios2/mm/ioremap.c +++ b/arch/nios2/mm/ioremap.c @@ -157,11 +157,11 @@ void __iomem *ioremap(unsigned long phys_addr, unsigned long size) EXPORT_SYMBOL(ioremap); /* - * __iounmap unmaps nearly everything, so be careful + * iounmap unmaps nearly everything, so be careful * it doesn't free currently pointer/page tables anymore but it * wasn't used anyway and might be added later. */ -void __iounmap(void __iomem *addr) +void iounmap(void __iomem *addr) { struct vm_struct *p; @@ -173,4 +173,4 @@ void __iounmap(void __iomem *addr) pr_err("iounmap: bad address %p\n", addr); kfree(p); } -EXPORT_SYMBOL(__iounmap); +EXPORT_SYMBOL(iounmap); |