diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-09-08 08:17:00 -0400 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-09-12 01:28:23 -0400 |
commit | cf1e929c8a389bc0be63f86100f962217ea99455 (patch) | |
tree | ba0ec2af8c1a63f77c80b78f624107a13f83e450 /drivers/clocksource/moxart_timer.c | |
parent | ba36d53db536d31c49c139484e82581eeb377278 (diff) |
clocksource/drivers/moxart: Replace setup_irq by request_irq
Save memory space and line of code by replacing setup_irq by request_irq.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/clocksource/moxart_timer.c')
-rw-r--r-- | drivers/clocksource/moxart_timer.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c index ad2bead9ce45..cba25b75c29b 100644 --- a/drivers/clocksource/moxart_timer.c +++ b/drivers/clocksource/moxart_timer.c | |||
@@ -79,7 +79,6 @@ struct moxart_timer { | |||
79 | unsigned int t1_enable_val; | 79 | unsigned int t1_enable_val; |
80 | unsigned int count_per_tick; | 80 | unsigned int count_per_tick; |
81 | struct clock_event_device clkevt; | 81 | struct clock_event_device clkevt; |
82 | struct irqaction act; | ||
83 | }; | 82 | }; |
84 | 83 | ||
85 | static inline struct moxart_timer *to_moxart(struct clock_event_device *evt) | 84 | static inline struct moxart_timer *to_moxart(struct clock_event_device *evt) |
@@ -201,10 +200,6 @@ static int __init moxart_timer_init(struct device_node *node) | |||
201 | timer->clkevt.set_next_event = moxart_clkevt_next_event; | 200 | timer->clkevt.set_next_event = moxart_clkevt_next_event; |
202 | timer->clkevt.cpumask = cpumask_of(0); | 201 | timer->clkevt.cpumask = cpumask_of(0); |
203 | timer->clkevt.irq = irq; | 202 | timer->clkevt.irq = irq; |
204 | timer->act.name = node->name; | ||
205 | timer->act.flags = IRQF_TIMER; | ||
206 | timer->act.handler = moxart_timer_interrupt; | ||
207 | timer->act.dev_id = &timer->clkevt; | ||
208 | 203 | ||
209 | ret = clocksource_mmio_init(timer->base + TIMER2_BASE + REG_COUNT, | 204 | ret = clocksource_mmio_init(timer->base + TIMER2_BASE + REG_COUNT, |
210 | "moxart_timer", pclk, 200, 32, | 205 | "moxart_timer", pclk, 200, 32, |
@@ -214,7 +209,8 @@ static int __init moxart_timer_init(struct device_node *node) | |||
214 | return ret; | 209 | return ret; |
215 | } | 210 | } |
216 | 211 | ||
217 | ret = setup_irq(irq, &timer->act); | 212 | ret = request_irq(irq, moxart_timer_interrupt, IRQF_TIMER, |
213 | node->name, &timer->clkevt); | ||
218 | if (ret) { | 214 | if (ret) { |
219 | pr_err("%s: setup_irq failed\n", node->full_name); | 215 | pr_err("%s: setup_irq failed\n", node->full_name); |
220 | return ret; | 216 | return ret; |