Skip to content

Commit

Permalink
[MIPS] Fix some sparse warnings on traps.c and irq-msc01.c
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
Atsushi Nemoto authored and Ralf Baechle committed Apr 28, 2008
1 parent 8558083 commit 411ba7f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 4 additions & 6 deletions arch/mips/kernel/irq-msc01.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/msc01_ic.h>
#include <asm/traps.h>

static unsigned long _icctrl_msc;
#define MSC01_IC_REG_BASE _icctrl_msc
Expand Down Expand Up @@ -98,14 +99,13 @@ void ll_msc_irq(void)
}
}

void
msc_bind_eic_interrupt(unsigned int irq, unsigned int set)
static void msc_bind_eic_interrupt(int irq, int set)
{
MSCIC_WRITE(MSC01_IC_RAMW,
(irq<<MSC01_IC_RAMW_ADDR_SHF) | (set<<MSC01_IC_RAMW_DATA_SHF));
}

struct irq_chip msc_levelirq_type = {
static struct irq_chip msc_levelirq_type = {
.name = "SOC-it-Level",
.ack = level_mask_and_ack_msc_irq,
.mask = mask_msc_irq,
Expand All @@ -115,7 +115,7 @@ struct irq_chip msc_levelirq_type = {
.end = end_msc_irq,
};

struct irq_chip msc_edgeirq_type = {
static struct irq_chip msc_edgeirq_type = {
.name = "SOC-it-Edge",
.ack = edge_mask_and_ack_msc_irq,
.mask = mask_msc_irq,
Expand All @@ -128,8 +128,6 @@ struct irq_chip msc_edgeirq_type = {

void __init init_msc_irqs(unsigned long icubase, unsigned int irqbase, msc_irqmap_t *imp, int nirq)
{
extern void (*board_bind_eic_interrupt)(unsigned int irq, unsigned int regset);

_icctrl_msc = (unsigned long) ioremap(icubase, 0x40000);

/* Reset interrupt controller - initialises all registers to 0 */
Expand Down
2 changes: 2 additions & 0 deletions include/asm-mips/traps.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@ extern int (*board_be_handler)(struct pt_regs *regs, int is_fixup);

extern void (*board_nmi_handler_setup)(void);
extern void (*board_ejtag_handler_setup)(void);
extern void (*board_bind_eic_interrupt)(int irq, int regset);
extern void (*board_watchpoint_handler)(struct pt_regs *regs);

#endif /* _ASM_TRAPS_H */

0 comments on commit 411ba7f

Please sign in to comment.