net: dsa: microchip: ksz8795: move cpu_select_interface to extra function

[linux-2.6-microblaze.git] / drivers / clocksource / bcm2835_timer.c

diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c
index b235f44..1592650 100644 (file)
--- a/drivers/clocksource/bcm2835_timer.c
+++ b/drivers/clocksource/bcm2835_timer.c
@@ -31,7 +31,6 @@ struct bcm2835_timer {
        void __iomem *compare;
        int match_mask;
        struct clock_event_device evt;
-       struct irqaction act;
 };
 
 static void __iomem *system_clock __read_mostly;
@@ -113,12 +112,9 @@ static int __init bcm2835_timer_init(struct device_node *node)
        timer->evt.features = CLOCK_EVT_FEAT_ONESHOT;
        timer->evt.set_next_event = bcm2835_time_set_next_event;
        timer->evt.cpumask = cpumask_of(0);
-       timer->act.name = node->name;
-       timer->act.flags = IRQF_TIMER | IRQF_SHARED;
-       timer->act.dev_id = timer;
-       timer->act.handler = bcm2835_time_interrupt;
 
-       ret = setup_irq(irq, &timer->act);
+       ret = request_irq(irq, bcm2835_time_interrupt, IRQF_TIMER | IRQF_SHARED,
+                         node->name, timer);
        if (ret) {
                pr_err("Can't set up timer IRQ\n");
                goto err_timer_free;