Commit 6a22d824 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

arm: remove ioremap_cached 



No users of ioremap_cached are left, remove it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 31f4f5b4

arch/arm/include/asm/io.h

+0 −6
Original line number Diff line number Diff line
@@ -400,12 +400,6 @@ void __iomem *ioremap(resource_size_t res_cookie, size_t size); 
void __iomem *ioremap_cache(resource_size_t res_cookie, size_t size);

#define ioremap_cache ioremap_cache



/*

 * Do not use ioremap_cached in new code. Provided for the benefit of

 * the pxa2xx-flash MTD driver only.

 */

void __iomem *ioremap_cached(resource_size_t res_cookie, size_t size);



void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size);

#define ioremap_wc ioremap_wc

#define ioremap_wt ioremap_wc

arch/arm/mm/ioremap.c

+0 −4
Original line number Diff line number Diff line
@@ -382,15 +382,11 @@ void __iomem *ioremap(resource_size_t res_cookie, size_t size) 
EXPORT_SYMBOL(ioremap);



void __iomem *ioremap_cache(resource_size_t res_cookie, size_t size)

	__alias(ioremap_cached);



void __iomem *ioremap_cached(resource_size_t res_cookie, size_t size)

{

	return arch_ioremap_caller(res_cookie, size, MT_DEVICE_CACHED,

				   __builtin_return_address(0));

}

EXPORT_SYMBOL(ioremap_cache);

EXPORT_SYMBOL(ioremap_cached);



void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size)

{

arch/arm/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static struct mem_type mem_types[] __ro_after_init = { 
		.prot_sect	= PROT_SECT_DEVICE,

		.domain		= DOMAIN_IO,

	},

	[MT_DEVICE_CACHED] = {	  /* ioremap_cached */

	[MT_DEVICE_CACHED] = {	  /* ioremap_cache */

		.prot_pte	= PROT_PTE_DEVICE | L_PTE_MT_DEV_CACHED,

		.prot_l1	= PMD_TYPE_TABLE,

		.prot_sect	= PROT_SECT_DEVICE | PMD_SECT_WB,

arch/arm/mm/nommu.c

+0 −4
Original line number Diff line number Diff line
@@ -206,15 +206,11 @@ void __iomem *ioremap(resource_size_t res_cookie, size_t size) 
EXPORT_SYMBOL(ioremap);



void __iomem *ioremap_cache(resource_size_t res_cookie, size_t size)

	__alias(ioremap_cached);



void __iomem *ioremap_cached(resource_size_t res_cookie, size_t size)

{

	return __arm_ioremap_caller(res_cookie, size, MT_DEVICE_CACHED,

				    __builtin_return_address(0));

}

EXPORT_SYMBOL(ioremap_cache);

EXPORT_SYMBOL(ioremap_cached);



void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size)

{