diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-25 22:58:40 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-25 22:58:40 -0500 |
| commit | 9d56dd3b083a3bec56e9da35ce07baca81030b03 (patch) | |
| tree | a9df9d514fbc32defc1ca8a6d7c2795f15b8a128 /arch/sh/mm/cache-sh4.c | |
| parent | a077e91690fb32a1453423b2cf1df3492fd30c3a (diff) | |
sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
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>
Diffstat (limited to 'arch/sh/mm/cache-sh4.c')
| -rw-r--r-- | arch/sh/mm/cache-sh4.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c index 87115b3ee70e..2cfae81914aa 100644 --- a/arch/sh/mm/cache-sh4.c +++ b/arch/sh/mm/cache-sh4.c | |||
| @@ -132,9 +132,9 @@ static void flush_icache_all(void) | |||
| 132 | jump_to_uncached(); | 132 | jump_to_uncached(); |
| 133 | 133 | ||
| 134 | /* Flush I-cache */ | 134 | /* Flush I-cache */ |
| 135 | ccr = ctrl_inl(CCR); | 135 | ccr = __raw_readl(CCR); |
| 136 | ccr |= CCR_CACHE_ICI; | 136 | ccr |= CCR_CACHE_ICI; |
| 137 | ctrl_outl(ccr, CCR); | 137 | __raw_writel(ccr, CCR); |
| 138 | 138 | ||
| 139 | /* | 139 | /* |
| 140 | * back_to_cached() will take care of the barrier for us, don't add | 140 | * 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); | |||
| 377 | void __init sh4_cache_init(void) | 377 | void __init sh4_cache_init(void) |
| 378 | { | 378 | { |
| 379 | printk("PVR=%08x CVR=%08x PRR=%08x\n", | 379 | printk("PVR=%08x CVR=%08x PRR=%08x\n", |
| 380 | ctrl_inl(CCN_PVR), | 380 | __raw_readl(CCN_PVR), |
| 381 | ctrl_inl(CCN_CVR), | 381 | __raw_readl(CCN_CVR), |
| 382 | ctrl_inl(CCN_PRR)); | 382 | __raw_readl(CCN_PRR)); |
| 383 | 383 | ||
| 384 | local_flush_icache_range = sh4_flush_icache_range; | 384 | local_flush_icache_range = sh4_flush_icache_range; |
| 385 | local_flush_dcache_page = sh4_flush_dcache_page; | 385 | local_flush_dcache_page = sh4_flush_dcache_page; |