[MIPS] tx4927: Cleanup unused macros and non-standard IO accessors.

This patch removes many unused constants, replaces non-standard IO
accessors with standard ones, and kills terrible tx4927_mips.h file.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 12 insertions, 12 deletions

diff --git a/arch/mips/tx4927/common/tx4927_dbgio.c b/arch/mips/tx4927/common/tx4927_dbgio.c
index 09bdf2baa835..d8423e001b2d 100644
--- a/arch/mips/tx4927/common/tx4927_dbgio.c
+++ b/arch/mips/tx4927/common/tx4927_dbgio.c
@@ -31,7 +31,6 @@
 
 #include <asm/mipsregs.h>
 #include <asm/system.h>
-#include <asm/tx4927/tx4927_mips.h>
 
 u8 getDebugChar(void)
 {
diff --git a/arch/mips/tx4927/common/tx4927_prom.c b/arch/mips/tx4927/common/tx4927_prom.c
index 7d4cbf512d8a..6eed53d8f386 100644
--- a/arch/mips/tx4927/common/tx4927_prom.c
+++ b/arch/mips/tx4927/common/tx4927_prom.c
@@ -38,7 +38,7 @@
 #include <asm/bootinfo.h>
 #include <asm/tx4927/tx4927.h>
 
-static unsigned int __init tx4927_process_sdccr(u64 * addr)
+static unsigned int __init tx4927_process_sdccr(unsigned long addr)
 {
         u64 val;
         unsigned int sdccr_ce;
@@ -52,7 +52,7 @@ static unsigned int __init tx4927_process_sdccr(u64 * addr)
         unsigned int mw = 0;
         unsigned int msize = 0;
 
-        val = (*((vu64 *) (addr)));
+        val = __raw_readq((void __iomem *)addr);
 
         /* MVMCP -- need #defs for these bits masks */
         sdccr_ce = ((val & (1 << 10)) >> 10);
@@ -136,10 +136,10 @@ unsigned int __init tx4927_get_mem_size(void)
         unsigned int total;
 
         /* MVMCP -- need #defs for these registers */
-        c0 = tx4927_process_sdccr((u64 *) 0xff1f8000);
-        c1 = tx4927_process_sdccr((u64 *) 0xff1f8008);
-        c2 = tx4927_process_sdccr((u64 *) 0xff1f8010);
-        c3 = tx4927_process_sdccr((u64 *) 0xff1f8018);
+        c0 = tx4927_process_sdccr(0xff1f8000);
+        c1 = tx4927_process_sdccr(0xff1f8008);
+        c2 = tx4927_process_sdccr(0xff1f8010);
+        c3 = tx4927_process_sdccr(0xff1f8018);
         total = c0 + c1 + c2 + c3;
 
         return (total);
diff --git a/arch/mips/tx4927/common/tx4927_setup.c b/arch/mips/tx4927/common/tx4927_setup.c
index c8e49feb345b..b18ed58f88a9 100644
--- a/arch/mips/tx4927/common/tx4927_setup.c
+++ b/arch/mips/tx4927/common/tx4927_setup.c
@@ -124,10 +124,10 @@ dump_cp0(char *key)
         return;
 }
 
-void print_pic(char *key, u32 reg, char *name)
+void print_pic(char *key, unsigned long reg, char *name)
 {
-        printk("%s pic:0x%08x:%s=0x%08x\n", key, reg, name,
-               TX4927_RD(reg));
+        printk(KERN_INFO "%s pic:0x%08lx:%s=0x%08x\n", key, reg, name,
+               __raw_readl((void __iomem *)reg));
         return;
 }
 
@@ -166,9 +166,10 @@ void dump_pic(char *key)
 }
 
 
-void print_addr(char *hdr, char *key, u32 addr)
+void print_addr(char *hdr, char *key, unsigned long addr)
 {
-        printk("%s %s:0x%08x=0x%08x\n", hdr, key, addr, TX4927_RD(addr));
+        printk(KERN_INFO "%s %s:0x%08lx=0x%08x\n", hdr, key, addr,
+               __raw_readl((void __iomem *)addr));
         return;
 }