Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e376897f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Will Deacon
Browse files

arm64: remove __iounmap 



No need to indirect iounmap for arm64.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 61b7cddf

arch/arm64/include/asm/io.h

+1 −2
Original line number Diff line number Diff line
@@ -163,14 +163,13 @@ extern void __memset_io(volatile void __iomem *, int, size_t); 
 * I/O memory mapping functions.

 */

extern void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot);

extern void __iounmap(volatile void __iomem *addr);

extern void iounmap(volatile void __iomem *addr);

extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);



#define ioremap(addr, size)		__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))

#define ioremap_nocache(addr, size)	__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))

#define ioremap_wc(addr, size)		__ioremap((addr), (size), __pgprot(PROT_NORMAL_NC))

#define ioremap_wt(addr, size)		__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))

#define iounmap				__iounmap



/*

 * PCI configuration space mapping function.

arch/arm64/mm/ioremap.c

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot) 
}

EXPORT_SYMBOL(__ioremap);



void __iounmap(volatile void __iomem *io_addr)

void iounmap(volatile void __iomem *io_addr)

{

	unsigned long addr = (unsigned long)io_addr & PAGE_MASK;
@@ -80,7 +80,7 @@ void __iounmap(volatile void __iomem *io_addr) 
	if (is_vmalloc_addr((void *)addr))

		vunmap((void *)addr);

}

EXPORT_SYMBOL(__iounmap);

EXPORT_SYMBOL(iounmap);



void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size)

{