diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-03-05 15:29:29 +0100 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2015-03-31 11:49:40 +0200 |
| commit | 9689e454d349f18dc53c5f3fa2e1a70cfbacbe63 (patch) | |
| tree | 45baa1503aca08e3571a357d599d913a21ff8ea1 | |
| parent | 0e9ece2d23f0bde21ff8b4fa51f749c0ed353ccd (diff) | |
clocksource/drivers/sun5i: Switch to request_irq
The current code uses setup_irq, while it could perfectly use the much simpler
request_irq. Switch to that.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Conflicts:
drivers/clocksource/timer-sun5i.c
| -rw-r--r-- | drivers/clocksource/timer-sun5i.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c index 58597fbcc046..03f04d85ca24 100644 --- a/drivers/clocksource/timer-sun5i.c +++ b/drivers/clocksource/timer-sun5i.c @@ -129,13 +129,6 @@ static irqreturn_t sun5i_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction sun5i_timer_irq = { - .name = "sun5i_timer0", - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .handler = sun5i_timer_interrupt, - .dev_id = &sun5i_clockevent, -}; - static void __init sun5i_timer_init(struct device_node *node) { struct reset_control *rstc; @@ -181,7 +174,8 @@ static void __init sun5i_timer_init(struct device_node *node) clockevents_config_and_register(&sun5i_clockevent, rate, TIMER_SYNC_TICKS, 0xffffffff); - ret = setup_irq(irq, &sun5i_timer_irq); + ret = request_irq(irq, sun5i_timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL, + "sun5i_timer0", &sun5i_clockevent); if (ret) pr_warn("failed to setup irq %d\n", irq); } |