diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-08-08 01:41:01 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-08-08 01:41:01 +0200 |
| commit | 9e8238020c5beba64e7ffafbb7ea0fb02fe68270 (patch) | |
| tree | 37c7fd953cfa7ebd3d6c476bc4c7d4de2302cdc3 /drivers/clocksource/timer-integrator-ap.c | |
| parent | Input: elan_i2c - add more hardware ID for Lenovo laptops (diff) | |
| parent | Input: exc3000 - add support to query model and fw_version (diff) | |
| download | linux-9e8238020c5beba64e7ffafbb7ea0fb02fe68270.tar.xz linux-9e8238020c5beba64e7ffafbb7ea0fb02fe68270.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.9 merge window.
Diffstat (limited to 'drivers/clocksource/timer-integrator-ap.c')
| -rw-r--r-- | drivers/clocksource/timer-integrator-ap.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c index c90a69c7b5fa..b0fcbaac58b0 100644 --- a/drivers/clocksource/timer-integrator-ap.c +++ b/drivers/clocksource/timer-integrator-ap.c @@ -123,13 +123,6 @@ static struct clock_event_device integrator_clockevent = { .rating = 300, }; -static struct irqaction integrator_timer_irq = { - .name = "timer", - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .handler = integrator_timer_interrupt, - .dev_id = &integrator_clockevent, -}; - static int integrator_clockevent_init(unsigned long inrate, void __iomem *base, int irq) { @@ -149,7 +142,9 @@ static int integrator_clockevent_init(unsigned long inrate, timer_reload = rate / HZ; writel(ctrl, clkevt_base + TIMER_CTRL); - ret = setup_irq(irq, &integrator_timer_irq); + ret = request_irq(irq, integrator_timer_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, "timer", + &integrator_clockevent); if (ret) return ret; |