diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-03-26 09:48:45 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-03-26 21:15:30 +0100 |
| commit | 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 (patch) | |
| tree | e72ff2b8af7523c13c56268935fdde592d1362cd /arch | |
| parent | 95fde7a83989d595c06105629f42f3691bf62f91 (diff) | |
| download | lwn-4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213.tar.gz lwn-4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213.zip | |
m68k: irq_node.handler() should return irqreturn_t
commit b5dc7840b3ebe9c7967dd8ba73db957767009ff9 ("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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/include/asm/irq_mm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/irq_mm.h b/arch/m68k/include/asm/irq_mm.h index 226bfc0f21b1..0cab42cad79e 100644 --- a/arch/m68k/include/asm/irq_mm.h +++ b/arch/m68k/include/asm/irq_mm.h @@ -3,6 +3,7 @@ #include <linux/linkage.h> #include <linux/hardirq.h> +#include <linux/irqreturn.h> #include <linux/spinlock_types.h> /* @@ -80,7 +81,7 @@ struct pt_regs; * interrupt source (if it supports chaining). */ typedef struct irq_node { - int (*handler)(int, void *); + irqreturn_t (*handler)(int, void *); void *dev_id; struct irq_node *next; unsigned long flags; |