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

Commit 28257f7f authored by Russell King's avatar Russell King
Browse files

ARM: io: simplify ioremap* and iounmap definitions 



We don't need to repeat the same definitions of the ioremap*(),
once in terms of __arch_ioremap() and again in terms of __arm_ioremap().
Instead, if the platform hasn't provided an __arch_ioremap, define
this to be __arm_ioremap, and only define the ioremap*() set using
__arch_ioremap.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a0b7bd08

arch/arm/include/asm/io.h

+4 −7
Original line number Diff line number Diff line
@@ -241,18 +241,15 @@ extern void _memset_io(volatile void __iomem *, int, size_t); 
 *

 */

#ifndef __arch_ioremap

#define ioremap(cookie,size)		__arm_ioremap(cookie, size, MT_DEVICE)

#define ioremap_nocache(cookie,size)	__arm_ioremap(cookie, size, MT_DEVICE)

#define ioremap_cached(cookie,size)	__arm_ioremap(cookie, size, MT_DEVICE_CACHED)

#define ioremap_wc(cookie,size)		__arm_ioremap(cookie, size, MT_DEVICE_WC)

#define iounmap				__iounmap

#else

#define __arch_ioremap			__arm_ioremap

#define __arch_iounmap			__iounmap

#endif



#define ioremap(cookie,size)		__arch_ioremap((cookie), (size), MT_DEVICE)

#define ioremap_nocache(cookie,size)	__arch_ioremap((cookie), (size), MT_DEVICE)

#define ioremap_cached(cookie,size)	__arch_ioremap((cookie), (size), MT_DEVICE_CACHED)

#define ioremap_wc(cookie,size)		__arch_ioremap((cookie), (size), MT_DEVICE_WC)

#define iounmap				__arch_iounmap

#endif



/*

 * io{read,write}{8,16,32} macros