Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be03e56b authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds
Browse files

m68knommu: use setup_irq() in 68328 timer code 



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: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5c4525da

arch/m68knommu/platform/68328/timers.c

+8 −3
Original line number Diff line number Diff line
@@ -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;