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

[~andy/linux] / arch / sh / boards / mach-highlander / psw.c

diff --git a/arch/sh/boards/mach-highlander/psw.c b/arch/sh/boards/mach-highlander/psw.c
index 37b1a2ee71a5398685b1579ad3a67170fc94a2e3..522786318d36c4f5dbee20c8cbdee94009bbf201 100644 (file)
--- a/arch/sh/boards/mach-highlander/psw.c
+++ b/arch/sh/boards/mach-highlander/psw.c
@@ -24,7 +24,7 @@ static irqreturn_t psw_irq_handler(int irq, void *arg)
        unsigned int l, mask;
        int ret = 0;
 
-       l = ctrl_inw(PA_DBSW);
+       l = __raw_readw(PA_DBSW);
 
        /* Nothing to do if there's no state change */
        if (psw->state) {
@@ -45,7 +45,7 @@ static irqreturn_t psw_irq_handler(int irq, void *arg)
 out:
        /* Clear the switch IRQs */
        l |= (0x7 << 12);
-       ctrl_outw(l, PA_DBSW);
+       __raw_writew(l, PA_DBSW);
 
        return IRQ_RETVAL(ret);
 }