4 files changed, 12 insertions, 30 deletions

diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c
index 2ce298f4d19..92d764c9770 100644
--- a/arch/mips/philips/pnx8550/common/setup.c
+++ b/arch/mips/philips/pnx8550/common/setup.c
@@ -74,7 +74,7 @@ struct resource standard_io_resources[] = {
         },
 };
 
-#define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))
+#define STANDARD_IO_RESOURCES ARRAY_SIZE(standard_io_resources)
 
 extern struct resource pci_io_resource;
 extern struct resource pci_mem_resource;
diff --git a/arch/mips/philips/pnx8550/common/time.c b/arch/mips/philips/pnx8550/common/time.c
index 6d494e0de3d..62f495b57f9 100644
--- a/arch/mips/philips/pnx8550/common/time.c
+++ b/arch/mips/philips/pnx8550/common/time.c
@@ -47,11 +47,6 @@ static struct clocksource pnx_clocksource = {
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-static void timer_ack(void)
-{
-        write_c0_compare(cpj);
-}
-
 static irqreturn_t pnx8xxx_timer_interrupt(int irq, void *dev_id)
 {
         struct clock_event_device *c = dev_id;
@@ -94,30 +89,22 @@ static struct clock_event_device pnx8xxx_clockevent = {
         .set_next_event = pnx8xxx_set_next_event,
 };
 
-/*
- * plat_time_init() - it does the following things:
- *
- * 1) plat_time_init() -
- *      a) (optional) set up RTC routines,
- *      b) (optional) calibrate and set the mips_hpt_frequency
- *          (only needed if you intended to use cpu counter as timer interrupt
- *           source)
- */
+static inline void timer_ack(void)
+{
+        write_c0_compare(cpj);
+}
 
 __init void plat_time_init(void)
 {
-        unsigned int             configPR;
-        unsigned int             n;
-        unsigned int             m;
-        unsigned int             p;
-        unsigned int             pow2p;
+        unsigned int configPR;
+        unsigned int n;
+        unsigned int m;
+        unsigned int p;
+        unsigned int pow2p;
 
         clockevents_register_device(&pnx8xxx_clockevent);
         clocksource_register(&pnx_clocksource);
 
-        setup_irq(PNX8550_INT_TIMER1, &pnx8xxx_timer_irq);
-        setup_irq(PNX8550_INT_TIMER2, &monotonic_irqaction);
-
         /* Timer 1 start */
         configPR = read_c0_config7();
         configPR &= ~0x00000008;
@@ -158,6 +145,6 @@ __init void plat_time_init(void)
         write_c0_count2(0);
         write_c0_compare2(0xffffffff);
 
+        setup_irq(PNX8550_INT_TIMER1, &pnx8xxx_timer_irq);
+        setup_irq(PNX8550_INT_TIMER2, &monotonic_irqaction);
 }
-
-
diff --git a/arch/mips/philips/pnx8550/jbs/init.c b/arch/mips/philips/pnx8550/jbs/init.c
index cfd90fa3d79..90b4d35f3ec 100644
--- a/arch/mips/philips/pnx8550/jbs/init.c
+++ b/arch/mips/philips/pnx8550/jbs/init.c
@@ -45,11 +45,8 @@ const char *get_system_type(void)
 
 void __init prom_init(void)
 {
-
         unsigned long memsize;
 
-        mips_machtype = MACH_PHILIPS_JBS;
-
         //memsize = 0x02800000; /* Trimedia uses memory above */
         memsize = 0x08000000; /* Trimedia uses memory above */
         add_memory_region(0, memsize, BOOT_MEM_RAM);
diff --git a/arch/mips/philips/pnx8550/stb810/prom_init.c b/arch/mips/philips/pnx8550/stb810/prom_init.c
index fdb33ed089b..832dd60b0a7 100644
--- a/arch/mips/philips/pnx8550/stb810/prom_init.c
+++ b/arch/mips/philips/pnx8550/stb810/prom_init.c
@@ -41,8 +41,6 @@ void __init prom_init(void)
 
         prom_init_cmdline();
 
-        mips_machtype = MACH_PHILIPS_STB810;
-
         memsize = 0x08000000; /* Trimedia uses memory above */
         add_memory_region(0, memsize, BOOT_MEM_RAM);
 }