lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m68k: irq_node.handler() should return irqreturn_t

Browse Source 
commit b5dc7840b3 ("m68k: introduce irq
controller") reverted the return type of struct irq_node.handler() from
irqreturn_t to int. Change it back to irqreturn_t, else it will give a
compiler warning when irqreturn_t is turned into an enum in the near future:

| arch/m68k/kernel/ints.c:231: warning: assignment from incompatible pointer type

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven
2009-03-26 09:48:45 +01:00
parent 95fde7a839
commit 4b2873ba0b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/m68k/include/asm/irq_mm.h
View File

@@ -3,6 +3,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/irqreturn.h>
#include <linux/spinlock_types.h> #include <linux/spinlock_types.h>
/* /*
@@ -80,7 +81,7 @@ struct pt_regs;
* interrupt source (if it supports chaining). * interrupt source (if it supports chaining).
*/ */
typedef struct irq_node { typedef struct irq_node {
int (*handler)(int, void *); irqreturn_t (*handler)(int, void *);
void *dev_id; void *dev_id;
struct irq_node *next; struct irq_node *next;
unsigned long flags; unsigned long flags;