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>

4 files changed, 13 insertions, 13 deletions

diff --git a/arch/sh/boards/mach-landisk/gio.c b/arch/sh/boards/mach-landisk/gio.c
index 528013188196..01e6abb769b9 100644
--- a/arch/sh/boards/mach-landisk/gio.c
+++ b/arch/sh/boards/mach-landisk/gio.c
@@ -76,39 +76,39 @@ static long gio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 break;
 
         case GIODRV_IOCSGIODATA1:       /* write byte */
-                ctrl_outb((unsigned char)(0x0ff & data), addr);
+                __raw_writeb((unsigned char)(0x0ff & data), addr);
                 break;
 
         case GIODRV_IOCSGIODATA2:       /* write word */
                 if (addr & 0x01) {
                         return -EFAULT;
                 }
-                ctrl_outw((unsigned short int)(0x0ffff & data), addr);
+                __raw_writew((unsigned short int)(0x0ffff & data), addr);
                 break;
 
         case GIODRV_IOCSGIODATA4:       /* write long */
                 if (addr & 0x03) {
                         return -EFAULT;
                 }
-                ctrl_outl(data, addr);
+                __raw_writel(data, addr);
                 break;
 
         case GIODRV_IOCGGIODATA1:       /* read byte */
-                data = ctrl_inb(addr);
+                data = __raw_readb(addr);
                 break;
 
         case GIODRV_IOCGGIODATA2:       /* read word */
                 if (addr & 0x01) {
                         return -EFAULT;
                 }
-                data = ctrl_inw(addr);
+                data = __raw_readw(addr);
                 break;
 
         case GIODRV_IOCGGIODATA4:       /* read long */
                 if (addr & 0x03) {
                         return -EFAULT;
                 }
-                data = ctrl_inl(addr);
+                data = __raw_readl(addr);
                 break;
         default:
                 return -EFAULT;
diff --git a/arch/sh/boards/mach-landisk/irq.c b/arch/sh/boards/mach-landisk/irq.c
index 7b284cde1f58..96f38a4187d0 100644
--- a/arch/sh/boards/mach-landisk/irq.c
+++ b/arch/sh/boards/mach-landisk/irq.c
@@ -22,14 +22,14 @@ static void disable_landisk_irq(unsigned int irq)
 {
         unsigned char mask = 0xff ^ (0x01 << (irq - 5));
 
-        ctrl_outb(ctrl_inb(PA_IMASK) & mask, PA_IMASK);
+        __raw_writeb(__raw_readb(PA_IMASK) & mask, PA_IMASK);
 }
 
 static void enable_landisk_irq(unsigned int irq)
 {
         unsigned char value = (0x01 << (irq - 5));
 
-        ctrl_outb(ctrl_inb(PA_IMASK) | value, PA_IMASK);
+        __raw_writeb(__raw_readb(PA_IMASK) | value, PA_IMASK);
 }
 
 static struct irq_chip landisk_irq_chip __read_mostly = {
@@ -52,5 +52,5 @@ void __init init_landisk_IRQ(void)
                                               handle_level_irq, "level");
                 enable_landisk_irq(i);
         }
-        ctrl_outb(0x00, PA_PWRINT_CLR);
+        __raw_writeb(0x00, PA_PWRINT_CLR);
 }
diff --git a/arch/sh/boards/mach-landisk/psw.c b/arch/sh/boards/mach-landisk/psw.c
index e6b0efa098d1..bef83522f958 100644
--- a/arch/sh/boards/mach-landisk/psw.c
+++ b/arch/sh/boards/mach-landisk/psw.c
@@ -25,7 +25,7 @@ static irqreturn_t psw_irq_handler(int irq, void *arg)
         unsigned int sw_value;
         int ret = 0;
 
-        sw_value = (0x0ff & (~ctrl_inb(PA_STATUS)));
+        sw_value = (0x0ff & (~__raw_readb(PA_STATUS)));
 
         /* Nothing to do if there's no state change */
         if (psw->state) {
@@ -42,7 +42,7 @@ static irqreturn_t psw_irq_handler(int irq, void *arg)
 
 out:
         /* Clear the switch IRQs */
-        ctrl_outb(0x00, PA_PWRINT_CLR);
+        __raw_writeb(0x00, PA_PWRINT_CLR);
 
         return IRQ_RETVAL(ret);
 }
diff --git a/arch/sh/boards/mach-landisk/setup.c b/arch/sh/boards/mach-landisk/setup.c
index 2d09d4d34f87..50337acc18c5 100644
--- a/arch/sh/boards/mach-landisk/setup.c
+++ b/arch/sh/boards/mach-landisk/setup.c
@@ -25,7 +25,7 @@ void init_landisk_IRQ(void);
 
 static void landisk_power_off(void)
 {
-        ctrl_outb(0x01, PA_SHUTDOWN);
+        __raw_writeb(0x01, PA_SHUTDOWN);
 }
 
 static struct resource cf_ide_resources[3];
@@ -88,7 +88,7 @@ __initcall(landisk_devices_setup);
 static void __init landisk_setup(char **cmdline_p)
 {
         /* LED ON */
-        ctrl_outb(ctrl_inb(PA_LED) | 0x03, PA_LED);
+        __raw_writeb(__raw_readb(PA_LED) | 0x03, PA_LED);
 
         printk(KERN_INFO "I-O DATA DEVICE, INC. \"LANDISK Series\" support.\n");
         pm_power_off = landisk_power_off;