Commit e3a1c5ce authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

[PATCH] use irqreturn_t in ColdFire interrupt setup code

Update ColdFire interrupt setup code to return irqreturn_t from
interrupt handlers.
parent e8f8679d
...@@ -43,12 +43,13 @@ volatile unsigned int num_spurious; ...@@ -43,12 +43,13 @@ volatile unsigned int num_spurious;
unsigned int local_bh_count[NR_CPUS]; unsigned int local_bh_count[NR_CPUS];
unsigned int local_irq_count[NR_CPUS]; unsigned int local_irq_count[NR_CPUS];
static void default_irq_handler(int irq, void *ptr, struct pt_regs *regs) static irqreturn_t default_irq_handler(int irq, void *ptr, struct pt_regs *regs)
{ {
#if 1 #if 1
printk("%s(%d): default irq handler vec=%d [0x%x]\n", printk("%s(%d): default irq handler vec=%d [0x%x]\n",
__FILE__, __LINE__, irq, irq); __FILE__, __LINE__, irq, irq);
#endif #endif
return(IRQ_HANDLED);
} }
/* /*
...@@ -96,8 +97,12 @@ irq_node_t *new_irq_node(void) ...@@ -96,8 +97,12 @@ irq_node_t *new_irq_node(void)
return NULL; return NULL;
} }
int request_irq(unsigned int irq, void (*handler)(int, void *, struct pt_regs *), int request_irq(
unsigned long flags, const char *devname, void *dev_id) unsigned int irq,
irqreturn_t (*handler)(int, void *, struct pt_regs *),
unsigned long flags,
const char *devname,
void *dev_id)
{ {
if (irq < 0 || irq >= NR_IRQS) { if (irq < 0 || irq >= NR_IRQS) {
printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__,
...@@ -159,7 +164,7 @@ void free_irq(unsigned int irq, void *dev_id) ...@@ -159,7 +164,7 @@ void free_irq(unsigned int irq, void *dev_id)
int sys_request_irq(unsigned int irq, int sys_request_irq(unsigned int irq,
void (*handler)(int, void *, struct pt_regs *), irqreturn_t (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id) unsigned long flags, const char *devname, void *dev_id)
{ {
if (irq > IRQ7) { if (irq > IRQ7) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment