microblaze: Use of_find_compatible_node for timer and intc

Calling of_find_compatible_node instead of calling private code
which does the same.

Signed-off-by: Michal Simek <monstr@monstr.eu>

2 files changed, 8 insertions, 26 deletions

diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index eb41441c7fd0..da33e45deba0 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -99,7 +99,7 @@ unsigned int get_irq(struct pt_regs *regs)
 
 void __init init_IRQ(void)
 {
-        u32 i, j, intr_type;
+        u32 i, intr_type;
         struct device_node *intc = NULL;
 #ifdef CONFIG_SELFMOD_INTC
         unsigned int intc_baseaddr = 0;
@@ -113,16 +113,7 @@ void __init init_IRQ(void)
                                 0
                         };
 #endif
-        const char * const intc_list[] = {
-                                "xlnx,xps-intc-1.00.a",
-                                NULL
-                        };
-
-        for (j = 0; intc_list[j] != NULL; j++) {
-                intc = of_find_compatible_node(NULL, NULL, intc_list[j]);
-                if (intc)
-                        break;
-        }
+        intc = of_find_compatible_node(NULL, NULL, "xlnx,xps-intc-1.00.a");
         BUG_ON(!intc);
 
         intc_baseaddr = be32_to_cpup(of_get_property(intc,
@@ -140,8 +131,8 @@ void __init init_IRQ(void)
 #ifdef CONFIG_SELFMOD_INTC
         selfmod_function((int *) arr_func, intc_baseaddr);
 #endif
-        printk(KERN_INFO "%s #0 at 0x%08x, num_irq=%d, edge=0x%x\n",
-                intc_list[j], intc_baseaddr, nr_irq, intr_type);
+        printk(KERN_INFO "XPS intc #0 at 0x%08x, num_irq=%d, edge=0x%x\n",
+                intc_baseaddr, nr_irq, intr_mask);
 
         /*
          * Disable all external interrupts until they are
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index af74b1113aab..3ba1e1c8c2eb 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -243,7 +243,7 @@ static int timer_initialized;
 
 void __init time_init(void)
 {
-        u32 irq, i = 0;
+        u32 irq;
         u32 timer_num = 1;
         struct device_node *timer = NULL;
         const void *prop;
@@ -258,16 +258,7 @@ void __init time_init(void)
                                 0
                         };
 #endif
-        const char * const timer_list[] = {
-                "xlnx,xps-timer-1.00.a",
-                NULL
-        };
-
-        for (i = 0; timer_list[i] != NULL; i++) {
-                timer = of_find_compatible_node(NULL, NULL, timer_list[i]);
-                if (timer)
-                        break;
-        }
+        timer = of_find_compatible_node(NULL, NULL, "xlnx,xps-timer-1.00.a");
         BUG_ON(!timer);
 
         timer_baseaddr = be32_to_cpup(of_get_property(timer, "reg", NULL));
@@ -283,8 +274,8 @@ void __init time_init(void)
 #ifdef CONFIG_SELFMOD_TIMER
         selfmod_function((int *) arr_func, timer_baseaddr);
 #endif
-        printk(KERN_INFO "%s #0 at 0x%08x, irq=%d\n",
-                timer_list[i], timer_baseaddr, irq);
+        printk(KERN_INFO "XPS timer #0 at 0x%08x, irq=%d\n",
+                timer_baseaddr, irq);
 
         /* If there is clock-frequency property than use it */
         prop = of_get_property(timer, "clock-frequency", NULL);