lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: Mass ctrl_in/outX to __raw_read/writeX conversion.

Browse Source 
The old ctrl in/out routines are non-portable and unsuitable for
cross-platform use. While drivers/sh has already been sanitized, there
is still quite a lot of code that is not. This converts the arch/sh/ bits
over, which permits us to flag the routines as deprecated whilst still
building with -Werror for the architecture code, and to ensure that
future users are not added.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2010-01-26 12:58:40 +09:00
parent a077e91690
commit 9d56dd3b08
115 changed files with 698 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/sh/mm/cache-sh4.c
View File

@@ -132,9 +132,9 @@ static void flush_icache_all(void)
jump_to_uncached();
/* Flush I-cache */
ccr = ctrl_inl(CCR);
ccr = __raw_readl(CCR);
ccr |= CCR_CACHE_ICI;
ctrl_outl(ccr, CCR);
__raw_writel(ccr, CCR);
/*
* back_to_cached() will take care of the barrier for us, don't add
@@ -377,9 +377,9 @@ extern void __weak sh4__flush_region_init(void);
void __init sh4_cache_init(void)
{
printk("PVR=%08x CVR=%08x PRR=%08x\n",
ctrl_inl(CCN_PVR),
ctrl_inl(CCN_CVR),
ctrl_inl(CCN_PRR));
__raw_readl(CCN_PVR),
__raw_readl(CCN_CVR),
__raw_readl(CCN_PRR));
local_flush_icache_range = sh4_flush_icache_range;
local_flush_dcache_page = sh4_flush_dcache_page;