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

[~andy/linux] / arch / sh / kernel / cpu / sh2a / clock-sh7203.c

diff --git a/arch/sh/kernel/cpu/sh2a/clock-sh7203.c b/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
index 940986965102468535ce920668d83e2f3d3827ba..7e75d8f795027a35a8d17c8b6c129682db0b54d7 100644 (file)
--- a/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7203.c
@@ -39,7 +39,7 @@ static const int pfc_divisors[]={1,2,3,4,6,8,12};
 
 static void master_clk_init(struct clk *clk)
 {
-       clk->rate *= pll1rate[(ctrl_inw(FREQCR) >> 8) & 0x0003] * PLL2 ;
+       clk->rate *= pll1rate[(__raw_readw(FREQCR) >> 8) & 0x0003] * PLL2 ;
 }
 
 static struct clk_ops sh7203_master_clk_ops = {
@@ -48,7 +48,7 @@ static struct clk_ops sh7203_master_clk_ops = {
 
 static unsigned long module_clk_recalc(struct clk *clk)
 {
-       int idx = (ctrl_inw(FREQCR) & 0x0007);
+       int idx = (__raw_readw(FREQCR) & 0x0007);
        return clk->parent->rate / pfc_divisors[idx];
 }
 
@@ -58,7 +58,7 @@ static struct clk_ops sh7203_module_clk_ops = {
 
 static unsigned long bus_clk_recalc(struct clk *clk)
 {
-       int idx = (ctrl_inw(FREQCR) & 0x0007);
+       int idx = (__raw_readw(FREQCR) & 0x0007);
        return clk->parent->rate / pfc_divisors[idx-2];
 }