Commit 98c90e5e authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

sh: remove __iounmap 



No need to indirect iounmap for sh.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 3f3ded99

arch/sh/include/asm/io.h

+2 −7
Original line number Diff line number Diff line
@@ -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

arch/sh/mm/ioremap.c

+2 −2
Original line number Diff line number Diff line
@@ -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);