diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-04-25 12:55:30 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-04-28 12:14:32 -0400 |
commit | 411ba7fcba54b30ba4ce2c492ea8d20f1d0db996 (patch) | |
tree | 1fe2b498d07cd685c142e037bda0885644f19705 /arch/mips/kernel | |
parent | 855808392adf499a29e6bdb418f9474726ecbace (diff) |
[MIPS] Fix some sparse warnings on traps.c and irq-msc01.c
* Declare board_bind_eic_interrupt, board_watchpoint_handler in traps.h
* Make msc_bind_eic_interrupt static and fix its argument types.
* Make msc_levelirq_type, msc_edgeirq_type static.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/irq-msc01.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c index 4edc7e451d9..963c16d266a 100644 --- a/arch/mips/kernel/irq-msc01.c +++ b/arch/mips/kernel/irq-msc01.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
18 | #include <asm/irq.h> | 18 | #include <asm/irq.h> |
19 | #include <asm/msc01_ic.h> | 19 | #include <asm/msc01_ic.h> |
20 | #include <asm/traps.h> | ||
20 | 21 | ||
21 | static unsigned long _icctrl_msc; | 22 | static unsigned long _icctrl_msc; |
22 | #define MSC01_IC_REG_BASE _icctrl_msc | 23 | #define MSC01_IC_REG_BASE _icctrl_msc |
@@ -98,14 +99,13 @@ void ll_msc_irq(void) | |||
98 | } | 99 | } |
99 | } | 100 | } |
100 | 101 | ||
101 | void | 102 | static void msc_bind_eic_interrupt(int irq, int set) |
102 | msc_bind_eic_interrupt(unsigned int irq, unsigned int set) | ||
103 | { | 103 | { |
104 | MSCIC_WRITE(MSC01_IC_RAMW, | 104 | MSCIC_WRITE(MSC01_IC_RAMW, |
105 | (irq<<MSC01_IC_RAMW_ADDR_SHF) | (set<<MSC01_IC_RAMW_DATA_SHF)); | 105 | (irq<<MSC01_IC_RAMW_ADDR_SHF) | (set<<MSC01_IC_RAMW_DATA_SHF)); |
106 | } | 106 | } |
107 | 107 | ||
108 | struct irq_chip msc_levelirq_type = { | 108 | static struct irq_chip msc_levelirq_type = { |
109 | .name = "SOC-it-Level", | 109 | .name = "SOC-it-Level", |
110 | .ack = level_mask_and_ack_msc_irq, | 110 | .ack = level_mask_and_ack_msc_irq, |
111 | .mask = mask_msc_irq, | 111 | .mask = mask_msc_irq, |
@@ -115,7 +115,7 @@ struct irq_chip msc_levelirq_type = { | |||
115 | .end = end_msc_irq, | 115 | .end = end_msc_irq, |
116 | }; | 116 | }; |
117 | 117 | ||
118 | struct irq_chip msc_edgeirq_type = { | 118 | static struct irq_chip msc_edgeirq_type = { |
119 | .name = "SOC-it-Edge", | 119 | .name = "SOC-it-Edge", |
120 | .ack = edge_mask_and_ack_msc_irq, | 120 | .ack = edge_mask_and_ack_msc_irq, |
121 | .mask = mask_msc_irq, | 121 | .mask = mask_msc_irq, |
@@ -128,8 +128,6 @@ struct irq_chip msc_edgeirq_type = { | |||
128 | 128 | ||
129 | void __init init_msc_irqs(unsigned long icubase, unsigned int irqbase, msc_irqmap_t *imp, int nirq) | 129 | void __init init_msc_irqs(unsigned long icubase, unsigned int irqbase, msc_irqmap_t *imp, int nirq) |
130 | { | 130 | { |
131 | extern void (*board_bind_eic_interrupt)(unsigned int irq, unsigned int regset); | ||
132 | |||
133 | _icctrl_msc = (unsigned long) ioremap(icubase, 0x40000); | 131 | _icctrl_msc = (unsigned long) ioremap(icubase, 0x40000); |
134 | 132 | ||
135 | /* Reset interrupt controller - initialises all registers to 0 */ | 133 | /* Reset interrupt controller - initialises all registers to 0 */ |