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>
This commit is contained in:
@ -50,12 +50,12 @@ static void sh3__flush_wback_region(void *start, int size)
|
||||
p = __pa(v);
|
||||
addr = addrstart | (v & current_cpu_data.dcache.entry_mask);
|
||||
local_irq_save(flags);
|
||||
data = ctrl_inl(addr);
|
||||
data = __raw_readl(addr);
|
||||
|
||||
if ((data & CACHE_PHYSADDR_MASK) ==
|
||||
(p & CACHE_PHYSADDR_MASK)) {
|
||||
data &= ~SH_CACHE_UPDATED;
|
||||
ctrl_outl(data, addr);
|
||||
__raw_writel(data, addr);
|
||||
local_irq_restore(flags);
|
||||
break;
|
||||
}
|
||||
@ -86,7 +86,7 @@ static void sh3__flush_purge_region(void *start, int size)
|
||||
data = (v & 0xfffffc00); /* _Virtual_ address, ~U, ~V */
|
||||
addr = CACHE_OC_ADDRESS_ARRAY |
|
||||
(v & current_cpu_data.dcache.entry_mask) | SH_CACHE_ASSOC;
|
||||
ctrl_outl(data, addr);
|
||||
__raw_writel(data, addr);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user