diff options
Diffstat (limited to 'arch/v850/kernel/gbus_int.c')
-rw-r--r-- | arch/v850/kernel/gbus_int.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/v850/kernel/gbus_int.c b/arch/v850/kernel/gbus_int.c index 25d636e79e6a..b2bcc251f65b 100644 --- a/arch/v850/kernel/gbus_int.c +++ b/arch/v850/kernel/gbus_int.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
18 | #include <linux/signal.h> | 18 | #include <linux/signal.h> |
19 | #include <linux/kernel.h> | ||
19 | 20 | ||
20 | #include <asm/machdep.h> | 21 | #include <asm/machdep.h> |
21 | 22 | ||
@@ -36,7 +37,7 @@ struct used_gint { | |||
36 | { 1, GBUS_INT_PRIORITY_HIGH }, | 37 | { 1, GBUS_INT_PRIORITY_HIGH }, |
37 | { 3, GBUS_INT_PRIORITY_LOW } | 38 | { 3, GBUS_INT_PRIORITY_LOW } |
38 | }; | 39 | }; |
39 | #define NUM_USED_GINTS (sizeof used_gint / sizeof used_gint[0]) | 40 | #define NUM_USED_GINTS ARRAY_SIZE(used_gint) |
40 | 41 | ||
41 | /* A table of which GINT is used by each GBUS interrupts (they are | 42 | /* A table of which GINT is used by each GBUS interrupts (they are |
42 | assigned based on priority). */ | 43 | assigned based on priority). */ |
@@ -231,8 +232,7 @@ struct gbus_int_irq_init gbus_irq_inits[] __initdata = { | |||
231 | { "GBUS_INT", IRQ_GBUS_INT(0), IRQ_GBUS_INT_NUM, 1, 6}, | 232 | { "GBUS_INT", IRQ_GBUS_INT(0), IRQ_GBUS_INT_NUM, 1, 6}, |
232 | { 0 } | 233 | { 0 } |
233 | }; | 234 | }; |
234 | #define NUM_GBUS_IRQ_INITS \ | 235 | #define NUM_GBUS_IRQ_INITS (ARRAY_SIZE(gbus_irq_inits) - 1) |
235 | ((sizeof gbus_irq_inits / sizeof gbus_irq_inits[0]) - 1) | ||
236 | 236 | ||
237 | static struct hw_interrupt_type gbus_hw_itypes[NUM_GBUS_IRQ_INITS]; | 237 | static struct hw_interrupt_type gbus_hw_itypes[NUM_GBUS_IRQ_INITS]; |
238 | 238 | ||