Switch SiByte drivers back to __raw_*() functions.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c
index be91b3990952..f859db02d3c9 100644
--- a/arch/mips/sibyte/sb1250/smp.c
+++ b/arch/mips/sibyte/sb1250/smp.c
@@ -29,18 +29,18 @@
 #include <asm/sibyte/sb1250_int.h>
 
 static void *mailbox_set_regs[] = {
-        (void *)IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_SET_CPU),
-        (void *)IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_SET_CPU)
+        IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_SET_CPU),
+        IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_SET_CPU)
 };
 
 static void *mailbox_clear_regs[] = {
-        (void *)IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_CLR_CPU),
-        (void *)IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_CLR_CPU)
+        IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_CLR_CPU),
+        IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_CLR_CPU)
 };
 
 static void *mailbox_regs[] = {
-        (void *)IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_CPU),
-        (void *)IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_CPU)
+        IOADDR(A_IMR_CPU0_BASE + R_IMR_MAILBOX_CPU),
+        IOADDR(A_IMR_CPU1_BASE + R_IMR_MAILBOX_CPU)
 };
 
 /*
@@ -73,7 +73,7 @@ void sb1250_smp_finish(void)
  */
 void core_send_ipi(int cpu, unsigned int action)
 {
-        bus_writeq((((u64)action) << 48), mailbox_set_regs[cpu]);
+        __raw_writeq((((u64)action) << 48), mailbox_set_regs[cpu]);
 }
 
 void sb1250_mailbox_interrupt(struct pt_regs *regs)
@@ -83,10 +83,10 @@ void sb1250_mailbox_interrupt(struct pt_regs *regs)
 
         kstat_this_cpu.irqs[K_INT_MBOX_0]++;
         /* Load the mailbox register to figure out what we're supposed to do */
-        action = (__bus_readq(mailbox_regs[cpu]) >> 48) & 0xffff;
+        action = (____raw_readq(mailbox_regs[cpu]) >> 48) & 0xffff;
 
         /* Clear the mailbox to clear the interrupt */
-        __bus_writeq(((u64)action) << 48, mailbox_clear_regs[cpu]);
+        ____raw_writeq(((u64)action) << 48, mailbox_clear_regs[cpu]);
 
         /*
          * Nothing to do for SMP_RESCHEDULE_YOURSELF; returning from the