Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 908dcecda1d18803b5823f30e6c47d2882dc0cf1

Authored by Jan Beulich
Committed by Linus Torvalds
1 parent a5d6839b75
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] adjust handle_IRR_event() return type 

Correct the return type of handle_IRQ_event() (inconsistency noticed during
Xen development), and remove redundant declarations.  The return type
adjustment required breaking out the definition of irqreturn_t into a
separate header, in order to satisfy current include order dependencies.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ian Molton <spyro@f2s.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Hirokazu Takata <takata.hirokazu@renesas.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 13 changed files with 31 additions and 57 deletions Side-by-side Diff

include/asm-alpha/irq.h
Diff comments   View file @ 908dcec
... ... @@ -92,9 +92,5 @@
92 92 struct pt_regs;
93 93 extern void (*perf_irq)(unsigned long, struct pt_regs *);
94 94  
95   -struct irqaction;
96   -int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
97   -
98   -
99 95 #endif /* _ALPHA_IRQ_H */
include/asm-arm/irq.h
Diff comments   View file @ 908dcec
... ... @@ -47,10 +47,6 @@
47 47 void enable_irq_wake(unsigned int irq);
48 48 int setup_irq(unsigned int, struct irqaction *);
49 49  
50   -struct irqaction;
51   -struct pt_regs;
52   -int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
53   -
54 50 extern void migrate_irqs(void);
55 51 #endif
include/asm-arm26/irq.h
Diff comments   View file @ 908dcec
... ... @@ -44,9 +44,5 @@
44 44  
45 45 int set_irq_type(unsigned int irq, unsigned int type);
46 46  
47   -int setup_irq(unsigned int, struct irqaction *);
48   -struct pt_regs;
49   -int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
50   -
51 47 #endif
include/asm-h8300/irq.h
Diff comments   View file @ 908dcec
... ... @@ -63,9 +63,5 @@
63 63 extern void disable_irq(unsigned int);
64 64 #define disable_irq_nosync(x) disable_irq(x)
65 65  
66   -struct irqaction;
67   -struct pt_regs;
68   -int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
69   -
70 66 #endif /* _H8300_IRQ_H_ */
include/asm-m68k/irq.h
Diff comments   View file @ 908dcec
... ... @@ -130,9 +130,5 @@
130 130 */
131 131 extern irq_node_t *new_irq_node(void);
132 132  
133   -struct irqaction;
134   -struct pt_regs;
135   -int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
136   -
137 133 #endif /* _M68K_IRQ_H_ */
include/asm-m68knommu/irq.h
Diff comments   View file @ 908dcec
... ... @@ -87,9 +87,5 @@
87 87 #define disable_irq(x) do { } while (0)
88 88 #define disable_irq_nosync(x) disable_irq(x)
89 89  
90   -struct irqaction;
91   -struct pt_regs;
92   -int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
93   -
94 90 #endif /* _M68K_IRQ_H_ */
include/asm-s390/irq.h
Diff comments   View file @ 908dcec
... ... @@ -21,10 +21,6 @@
21 21  
22 22 #define touch_nmi_watchdog() do { } while(0)
23 23  
24   -struct irqaction;
25   -struct pt_regs;
26   -int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
27   -
28 24 #endif /* __KERNEL__ */
29 25 #endif
include/asm-sparc/irq.h
Diff comments   View file @ 908dcec
... ... @@ -181,9 +181,5 @@
181 181 #define SUN4M_INT_SBUS(x) (1 << (x+7))
182 182 #define SUN4M_INT_VME(x) (1 << (x))
183 183  
184   -struct irqaction;
185   -struct pt_regs;
186   -int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
187   -
188 184 #endif
include/asm-v850/irq.h
Diff comments   View file @ 908dcec
... ... @@ -62,8 +62,6 @@
62 62 /* Disable an irq without waiting. */
63 63 extern void disable_irq_nosync (unsigned int irq);
64 64  
65   -extern int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
66   -
67 65 #endif /* !__ASSEMBLY__ */
68 66  
69 67 #endif /* __V850_IRQ_H__ */
include/linux/interrupt.h
Diff comments   View file @ 908dcec
... ... @@ -7,31 +7,12 @@
7 7 #include <linux/bitops.h>
8 8 #include <linux/preempt.h>
9 9 #include <linux/cpumask.h>
  10 +#include <linux/irqreturn.h>
10 11 #include <linux/hardirq.h>
11 12 #include <linux/sched.h>
12 13 #include <asm/atomic.h>
13 14 #include <asm/ptrace.h>
14 15 #include <asm/system.h>
15   -
16   -/*
17   - * For 2.4.x compatibility, 2.4.x can use
18   - *
19   - * typedef void irqreturn_t;
20   - * #define IRQ_NONE
21   - * #define IRQ_HANDLED
22   - * #define IRQ_RETVAL(x)
23   - *
24   - * To mix old-style and new-style irq handler returns.
25   - *
26   - * IRQ_NONE means we didn't handle it.
27   - * IRQ_HANDLED means that we did have a valid interrupt and handled it.
28   - * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled)
29   - */
30   -typedef int irqreturn_t;
31   -
32   -#define IRQ_NONE (0)
33   -#define IRQ_HANDLED (1)
34   -#define IRQ_RETVAL(x) ((x) != 0)
35 16  
36 17 struct irqaction {
37 18 irqreturn_t (*handler)(int, void *, struct pt_regs *);
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/cache.h>
18 18 #include <linux/spinlock.h>
19 19 #include <linux/cpumask.h>
  20 +#include <linux/irqreturn.h>
20 21  
21 22 #include <asm/irq.h>
22 23 #include <asm/ptrace.h>
... ... @@ -175,7 +176,7 @@
175 176 extern int no_irq_affinity;
176 177 extern int noirqdebug_setup(char *str);
177 178  
178   -extern fastcall int handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
  179 +extern fastcall irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
179 180 struct irqaction *action);
180 181 extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs);
181 182 extern void note_interrupt(unsigned int irq, irq_desc_t *desc,
include/linux/irqreturn.h
Diff comments   View file @ 908dcec
  1 +/* irqreturn.h */
  2 +#ifndef _LINUX_IRQRETURN_H
  3 +#define _LINUX_IRQRETURN_H
  4 +
  5 +/*
  6 + * For 2.4.x compatibility, 2.4.x can use
  7 + *
  8 + * typedef void irqreturn_t;
  9 + * #define IRQ_NONE
  10 + * #define IRQ_HANDLED
  11 + * #define IRQ_RETVAL(x)
  12 + *
  13 + * To mix old-style and new-style irq handler returns.
  14 + *
  15 + * IRQ_NONE means we didn't handle it.
  16 + * IRQ_HANDLED means that we did have a valid interrupt and handled it.
  17 + * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled)
  18 + */
  19 +typedef int irqreturn_t;
  20 +
  21 +#define IRQ_NONE (0)
  22 +#define IRQ_HANDLED (1)
  23 +#define IRQ_RETVAL(x) ((x) != 0)
  24 +
  25 +#endif
... ... @@ -76,10 +76,11 @@
76 76 /*
77 77 * Have got an event to handle:
78 78 */
79   -fastcall int handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
  79 +fastcall irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
80 80 struct irqaction *action)
81 81 {
82   - int ret, retval = 0, status = 0;
  82 + irqreturn_t ret, retval = IRQ_NONE;
  83 + unsigned int status = 0;
83 84  
84 85 if (!(action->flags & SA_INTERRUPT))
85 86 local_irq_enable();