diff options
| author | afzal mohammed <afzal.mohd.ma@gmail.com> | 2020-03-01 02:26:55 +0100 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2020-03-23 03:01:19 +0100 |
| commit | ba000760eb0f182e6ef04faca70bb9737a9674b4 (patch) | |
| tree | 0e0aa627224a6b37d4204ee2e8ad092d48ede5b1 /arch/m68k/68000 | |
| parent | Linux 5.6-rc7 (diff) | |
| download | linux-ba000760eb0f182e6ef04faca70bb9737a9674b4.tar.xz linux-ba000760eb0f182e6ef04faca70bb9737a9674b4.zip | |
m68k: Replace setup_irq() by request_irq()
request_irq() is preferred over setup_irq(). Invocations of setup_irq()
occur after memory allocators are ready.
Per tglx[1], setup_irq() existed in olden days when allocators were not
ready by the time early interrupts were initialized.
Hence replace setup_irq() by request_irq().
[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
Signed-off-by: afzal mohammed <afzal.mohd.ma@gmail.com>
Tested-by: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k/68000')
| -rw-r--r-- | arch/m68k/68000/timers.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/m68k/68000/timers.c b/arch/m68k/68000/timers.c index 71ddb4c98726..1c8e8a83c325 100644 --- a/arch/m68k/68000/timers.c +++ b/arch/m68k/68000/timers.c @@ -68,14 +68,6 @@ static irqreturn_t hw_tick(int irq, void *dummy) /***************************************************************************/ -static struct irqaction m68328_timer_irq = { - .name = "timer", - .flags = IRQF_TIMER, - .handler = hw_tick, -}; - -/***************************************************************************/ - static u64 m68328_read_clk(struct clocksource *cs) { unsigned long flags; @@ -102,11 +94,17 @@ static struct clocksource m68328_clk = { void hw_timer_init(irq_handler_t handler) { + int ret; + /* disable timer 1 */ TCTL = 0; /* set ISR */ - setup_irq(TMR_IRQ_NUM, &m68328_timer_irq); + ret = request_irq(TMR_IRQ_NUM, hw_tick, IRQF_TIMER, "timer", NULL); + if (ret) { + pr_err("Failed to request irq %d (timer): %pe\n", TMR_IRQ_NUM, + ERR_PTR(ret)); + } /* Restart mode, Enable int, Set clock source */ TCTL = TCTL_OM | TCTL_IRQEN | CLOCK_SOURCE; |