3 files changed, 26 insertions, 26 deletions

diff --git a/arch/sh/boards/mach-hp6xx/hp6xx_apm.c b/arch/sh/boards/mach-hp6xx/hp6xx_apm.c
index e85212faf40a..b49535c0ddd9 100644
--- a/arch/sh/boards/mach-hp6xx/hp6xx_apm.c
+++ b/arch/sh/boards/mach-hp6xx/hp6xx_apm.c
@@ -53,7 +53,7 @@ static void hp6x0_apm_get_power_status(struct apm_power_info *info)
         info->ac_line_status = (battery > HP680_BATTERY_AC_ON) ?
                          APM_AC_ONLINE : APM_AC_OFFLINE;
 
-        pgdr = ctrl_inb(PGDR);
+        pgdr = __raw_readb(PGDR);
         if (pgdr & PGDR_MAIN_BATTERY_OUT) {
                 info->battery_status    = APM_BATTERY_STATUS_NOT_PRESENT;
                 info->battery_flag      = 0x80;
diff --git a/arch/sh/boards/mach-hp6xx/pm.c b/arch/sh/boards/mach-hp6xx/pm.c
index d936c1af7620..4499a3749d40 100644
--- a/arch/sh/boards/mach-hp6xx/pm.c
+++ b/arch/sh/boards/mach-hp6xx/pm.c
@@ -53,17 +53,17 @@ static void pm_enter(void)
         sh_wdt_write_cnt(0);
 
         /* disable PLL1 */
-        frqcr = ctrl_inw(FRQCR);
+        frqcr = __raw_readw(FRQCR);
         frqcr &= ~(FRQCR_PLLEN | FRQCR_PSTBY);
-        ctrl_outw(frqcr, FRQCR);
+        __raw_writew(frqcr, FRQCR);
 
         /* enable standby */
-        stbcr = ctrl_inb(STBCR);
-        ctrl_outb(stbcr | STBCR_STBY | STBCR_MSTP2, STBCR);
+        stbcr = __raw_readb(STBCR);
+        __raw_writeb(stbcr | STBCR_STBY | STBCR_MSTP2, STBCR);
 
         /* set self-refresh */
-        mcr = ctrl_inw(MCR);
-        ctrl_outw(mcr & ~MCR_RFSH, MCR);
+        mcr = __raw_readw(MCR);
+        __raw_writew(mcr & ~MCR_RFSH, MCR);
 
         /* set interrupt handler */
         asm volatile("stc vbr, %0" : "=r" (vbr_old));
@@ -73,8 +73,8 @@ static void pm_enter(void)
                &wakeup_start, &wakeup_end - &wakeup_start);
         asm volatile("ldc %0, vbr" : : "r" (vbr_new));
 
-        ctrl_outw(0, RTCNT);
-        ctrl_outw(mcr | MCR_RFSH | MCR_RMODE, MCR);
+        __raw_writew(0, RTCNT);
+        __raw_writew(mcr | MCR_RFSH | MCR_RMODE, MCR);
 
         cpu_sleep();
 
@@ -83,14 +83,14 @@ static void pm_enter(void)
         free_page(vbr_new);
 
         /* enable PLL1 */
-        frqcr = ctrl_inw(FRQCR);
+        frqcr = __raw_readw(FRQCR);
         frqcr |= FRQCR_PSTBY;
-        ctrl_outw(frqcr, FRQCR);
+        __raw_writew(frqcr, FRQCR);
         udelay(50);
         frqcr |= FRQCR_PLLEN;
-        ctrl_outw(frqcr, FRQCR);
+        __raw_writew(frqcr, FRQCR);
 
-        ctrl_outb(stbcr, STBCR);
+        __raw_writeb(stbcr, STBCR);
 
         clear_bl_bit();
 }
@@ -115,21 +115,21 @@ static int hp6x0_pm_enter(suspend_state_t state)
         outw(hd64461_stbcr, HD64461_STBCR);
 #endif
 
-        ctrl_outb(0x1f, DACR);
+        __raw_writeb(0x1f, DACR);
 
-        stbcr = ctrl_inb(STBCR);
-        ctrl_outb(0x01, STBCR);
+        stbcr = __raw_readb(STBCR);
+        __raw_writeb(0x01, STBCR);
 
-        stbcr2 = ctrl_inb(STBCR2);
-        ctrl_outb(0x7f , STBCR2);
+        stbcr2 = __raw_readb(STBCR2);
+        __raw_writeb(0x7f , STBCR2);
 
         outw(0xf07f, HD64461_SCPUCR);
 
         pm_enter();
 
         outw(0, HD64461_SCPUCR);
-        ctrl_outb(stbcr, STBCR);
-        ctrl_outb(stbcr2, STBCR2);
+        __raw_writeb(stbcr, STBCR);
+        __raw_writeb(stbcr2, STBCR2);
 
 #ifdef CONFIG_HD64461_ENABLER
         hd64461_stbcr = inw(HD64461_STBCR);
diff --git a/arch/sh/boards/mach-hp6xx/setup.c b/arch/sh/boards/mach-hp6xx/setup.c
index e6dd5e96321e..8c9add5f4cfa 100644
--- a/arch/sh/boards/mach-hp6xx/setup.c
+++ b/arch/sh/boards/mach-hp6xx/setup.c
@@ -149,19 +149,19 @@ static void __init hp6xx_setup(char **cmdline_p)
 
         sh_dac_output(0, DAC_SPEAKER_VOLUME);
         sh_dac_disable(DAC_SPEAKER_VOLUME);
-        v8 = ctrl_inb(DACR);
+        v8 = __raw_readb(DACR);
         v8 &= ~DACR_DAE;
-        ctrl_outb(v8,DACR);
+        __raw_writeb(v8,DACR);
 
-        v8 = ctrl_inb(SCPDR);
+        v8 = __raw_readb(SCPDR);
         v8 |= SCPDR_TS_SCAN_X | SCPDR_TS_SCAN_Y;
         v8 &= ~SCPDR_TS_SCAN_ENABLE;
-        ctrl_outb(v8, SCPDR);
+        __raw_writeb(v8, SCPDR);
 
-        v = ctrl_inw(SCPCR);
+        v = __raw_readw(SCPCR);
         v &= ~SCPCR_TS_MASK;
         v |= SCPCR_TS_ENABLE;
-        ctrl_outw(v, SCPCR);
+        __raw_writew(v, SCPCR);
 }
 device_initcall(hp6xx_devices_setup);