Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-block.git] / drivers / clocksource / bcm_kona_timer.c

diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
index 350f4935645857e23b3bb2ada19529607883af46..ba3d85904c9ab045affb593640b1010e12149ce0 100644 (file)
--- a/drivers/clocksource/bcm_kona_timer.c
+++ b/drivers/clocksource/bcm_kona_timer.c
@@ -103,16 +103,10 @@ static const struct of_device_id bcm_timer_ids[] __initconst = {
        {},
 };
 
-static void __init kona_timers_init(void)
+static void __init kona_timers_init(struct device_node *node)
 {
-       struct device_node *node;
        u32 freq;
 
-       node = of_find_matching_node(NULL, bcm_timer_ids);
-
-       if (!node)
-               panic("No timer");
-
        if (!of_property_read_u32(node, "clock-frequency", &freq))
                arch_timer_rate = freq;
        else
@@ -199,13 +193,12 @@ static struct irqaction kona_timer_irq = {
        .handler = kona_timer_interrupt,
 };
 
-static void __init kona_timer_init(void)
+static void __init kona_timer_init(struct device_node *node)
 {
-       kona_timers_init();
+       kona_timers_init(node);
        kona_timer_clockevents_init();
        setup_irq(timers.tmr_irq, &kona_timer_irq);
        kona_timer_set_next_event((arch_timer_rate / HZ), NULL);
 }
 
-CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer",
-       kona_timer_init);
+CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);