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>

2 files changed, 5 insertions, 5 deletions

diff --git a/arch/sh/boards/mach-sdk7780/irq.c b/arch/sh/boards/mach-sdk7780/irq.c
index 855558163c58..e5f7564f2511 100644
--- a/arch/sh/boards/mach-sdk7780/irq.c
+++ b/arch/sh/boards/mach-sdk7780/irq.c
@@ -37,9 +37,9 @@ void __init init_sdk7780_IRQ(void)
 {
         printk(KERN_INFO "Using SDK7780 interrupt controller.\n");
 
-        ctrl_outw(0xFFFF, FPGA_IRQ0MR);
+        __raw_writew(0xFFFF, FPGA_IRQ0MR);
         /* Setup IRL 0-3 */
-        ctrl_outw(0x0003, FPGA_IMSR);
+        __raw_writew(0x0003, FPGA_IMSR);
         plat_irq_setup_pins(IRQ_MODE_IRL3210);
 
         register_intc_controller(&fpga_intc_desc);
diff --git a/arch/sh/boards/mach-sdk7780/setup.c b/arch/sh/boards/mach-sdk7780/setup.c
index b887373a2599..4da38db4b5fe 100644
--- a/arch/sh/boards/mach-sdk7780/setup.c
+++ b/arch/sh/boards/mach-sdk7780/setup.c
@@ -74,8 +74,8 @@ device_initcall(sdk7780_devices_setup);
 
 static void __init sdk7780_setup(char **cmdline_p)
 {
-        u16 ver = ctrl_inw(FPGA_FPVERR);
-        u16 dateStamp = ctrl_inw(FPGA_FPDATER);
+        u16 ver = __raw_readw(FPGA_FPVERR);
+        u16 dateStamp = __raw_readw(FPGA_FPDATER);
 
         printk(KERN_INFO "Renesas Technology Europe SDK7780 support.\n");
         printk(KERN_INFO "Board version: %d (revision %d), "
@@ -85,7 +85,7 @@ static void __init sdk7780_setup(char **cmdline_p)
                          dateStamp);
 
         /* Setup pin mux'ing for PCIC */
-        ctrl_outw(0x0000, GPIO_PECR);
+        __raw_writew(0x0000, GPIO_PECR);
 }
 
 /*