Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 411ba7fc authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[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: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 85580839

arch/mips/kernel/irq-msc01.c

+4 −6
Original line number Diff line number Diff line
@@ -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
@@ -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,
@@ -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,
@@ -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 */

include/asm-mips/traps.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */