* [M68KNOMMU]: use setup_irq() in 68328 timer code
@ 2007-07-26 15:09 Greg Ungerer
0 siblings, 0 replies; only message in thread
From: Greg Ungerer @ 2007-07-26 15:09 UTC (permalink / raw)
To: torvalds; +Cc: gerg, linux-kernel
Use setup_irq() instead of request_irq() to set up system timer
in 68328 timer code. With the old m68knommu irq code this
was safe, but it is not now within the generic irq framework.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
diff -Naur linux-2.6.23-rc1-git2/arch/m68knommu/platform/68328/timers.c linux/arch/m68knommu/platform/68328/timers.c
--- linux-2.6.23-rc1-git2/arch/m68knommu/platform/68328/timers.c 2007-07-26 10:47:40.000000000 +1000
+++ linux/arch/m68knommu/platform/68328/timers.c 2007-07-26 22:55:51.000000000 +1000
@@ -18,10 +18,10 @@
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <asm/setup.h>
#include <asm/system.h>
#include <asm/pgtable.h>
-#include <asm/irq.h>
#include <asm/machdep.h>
#include <asm/MC68VZ328.h>
@@ -53,14 +53,19 @@
/***************************************************************************/
+static struct irqaction m68328_timer_irq = {
+ .name = "timer",
+ .flags = IRQF_DISABLED | IRQF_TIMER,
+};
+
void m68328_timer_init(irq_handler_t timer_routine)
{
/* disable timer 1 */
TCTL = 0;
/* set ISR */
- if (request_irq(TMR_IRQ_NUM, timer_routine, IRQ_FLG_LOCK, "timer", NULL))
- panic("Unable to attach timer interrupt\n");
+ m68328_timer_irq.handler = timer_routine;
+ setup_irq(TMR_IRQ_NUM, &m68328_timer_irq);
/* Restart mode, Enable int, Set clock source */
TCTL = TCTL_OM | TCTL_IRQEN | CLOCK_SOURCE;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-07-26 15:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-07-26 15:09 [M68KNOMMU]: use setup_irq() in 68328 timer code Greg Ungerer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®