Commit ab53cea4 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

xtensa: clean up ioremap 



Use ioremap as the main implemented function, and defined
ioremap_nocache to it as a deprecated alias.

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

arch/xtensa/include/asm/io.h

+4 −10
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ void xtensa_iounmap(volatile void __iomem *addr); 
/*

 * Return the virtual address for the specified bus memory.

 */

static inline void __iomem *ioremap_nocache(unsigned long offset,

		unsigned long size)

static inline void __iomem *ioremap(unsigned long offset, unsigned long size)

{

	if (offset >= XCHAL_KIO_PADDR

	    && offset - XCHAL_KIO_PADDR < XCHAL_KIO_SIZE)
@@ -52,15 +51,10 @@ static inline void __iomem *ioremap_cache(unsigned long offset, 
		return xtensa_ioremap_cache(offset, size);

}

#define ioremap_cache ioremap_cache

#define ioremap_nocache ioremap_nocache



#define ioremap_wc ioremap_nocache

#define ioremap_wt ioremap_nocache



static inline void __iomem *ioremap(unsigned long offset, unsigned long size)

{

	return ioremap_nocache(offset, size);

}

#define ioremap_nocache ioremap

#define ioremap_wc ioremap

#define ioremap_wt ioremap



static inline void iounmap(volatile void __iomem *addr)

{