ARM: rename ioremap_cached to ioremap_cache
Subsystems (3)
PATCH 1/1 ARM: rename ioremap_cached to ioremap_cache
From: Rob Herring <[email protected]>
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]
--- arch/arm/include/asm/io.h | 2 +- arch/arm/include/asm/xen/page.h | 2 +- drivers/mtd/maps/pxa2xx-flash.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/include/asm/io.h +1 -1
@@ -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
@@ -123,6 +123,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
@@ -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);
Signature · 1 line
1.8.1.2
PATCH 1/1 ARM: rename ioremap_cached to ioremap_cache
Quoted 11 lines · Rob Herring
From: Rob Herring <[email protected]>
ioremap_cacheis 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]
Quoted 5 lines
Signed-off-by Rob Herring <[email protected]>Cc Russell King <[email protected]>Cc Stefano Stabellini <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>
Yep, we need this after "arm64: allow ioremap_cache() to use existing RAM mappings".
Quoted 46 lines
arch/arm/include/asm/io.h | 2 +- arch/arm/include/asm/xen/page.h | 2 +- drivers/mtd/maps/pxa2xx-flash.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)arch/arm/include/asm/io.h +1
-1@@ -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_iounmaparch/arm/include/asm/xen/page.h +1
-1@@ -123,6 +123,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@@ -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);Signature · 1 line
1.8.1.2
PATCH 1/1 ARM: rename ioremap_cached to ioremap_cache
In reply to Rob HerringQuoted 4 lines · Rob Herring
From: Rob Herring <[email protected]>
ioremap_cacheis more aligned with other architectures. There are only 2 users of this in the kernel: pxa2xx-flash and Xen.
I missed Xen here. I agree with this patch, ioremap_cache() is more widely used.