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

Commit 0a5ccc86 authored by Rob Herring's avatar Rob Herring Committed by Russell King
Browse files

ARM: 7933/1: rename ioremap_cached to ioremap_cache 



ioremap_cache is more aligned with other architectures.
There are only 2 users of this in the kernel: pxa2xx-flash and Xen.

This fixes Xen build failures on arm64:

drivers/tty/hvc/hvc_xen.c:233:2: error: implicit declaration of function 'ioremap_cached' [-Werror=implicit-function-declaration]
drivers/xen/grant-table.c:1174:3: error: implicit declaration of function 'ioremap_cached' [-Werror=implicit-function-declaration]
drivers/xen/xenbus/xenbus_probe.c:778:4: error: implicit declaration of function 'ioremap_cached' [-Werror=implicit-function-declaration]

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 29c350bf

arch/arm/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ extern void _memset_io(volatile void __iomem *, int, size_t); 
 */

#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_cache(cookie,size)	__arm_ioremap((cookie), (size), MT_DEVICE_CACHED)

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

#define iounmap				__arm_iounmap

arch/arm/include/asm/xen/page.h

+1 −1
Original line number Diff line number Diff line
@@ -117,6 +117,6 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
	return __set_phys_to_machine(pfn, mfn);

}



#define xen_remap(cookie, size) ioremap_cached((cookie), (size));

#define xen_remap(cookie, size) ioremap_cache((cookie), (size));



#endif /* _ASM_ARM_XEN_PAGE_H */

drivers/mtd/maps/pxa2xx-flash.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int pxa2xx_flash_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}

	info->map.cached =

		ioremap_cached(info->map.phys, info->map.size);

		ioremap_cache(info->map.phys, info->map.size);

	if (!info->map.cached)

		printk(KERN_WARNING "Failed to ioremap cached %s\n",

		       info->map.name);