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

Commit 12ea59e8 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] m32r: NULL noise removal 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 870e75a2

arch/m32r/kernel/setup_mappi.c

+8 −8
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void __init init_IRQ(void) 
	/* INT0 : LAN controller (RTL8019AS) */

	irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED;

	irq_desc[M32R_IRQ_INT0].chip = &mappi_irq_type;

	irq_desc[M32R_IRQ_INT0].action = 0;

	irq_desc[M32R_IRQ_INT0].action = NULL;

	irq_desc[M32R_IRQ_INT0].depth = 1;

	icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10;

	disable_mappi_irq(M32R_IRQ_INT0);
@@ -95,7 +95,7 @@ void __init init_IRQ(void) 
	/* MFT2 : system timer */

	irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED;

	irq_desc[M32R_IRQ_MFT2].chip = &mappi_irq_type;

	irq_desc[M32R_IRQ_MFT2].action = 0;

	irq_desc[M32R_IRQ_MFT2].action = NULL;

	irq_desc[M32R_IRQ_MFT2].depth = 1;

	icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN;

	disable_mappi_irq(M32R_IRQ_MFT2);
@@ -104,7 +104,7 @@ void __init init_IRQ(void) 
	/* SIO0_R : uart receive data */

	irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED;

	irq_desc[M32R_IRQ_SIO0_R].chip = &mappi_irq_type;

	irq_desc[M32R_IRQ_SIO0_R].action = 0;

	irq_desc[M32R_IRQ_SIO0_R].action = NULL;

	irq_desc[M32R_IRQ_SIO0_R].depth = 1;

	icu_data[M32R_IRQ_SIO0_R].icucr = 0;

	disable_mappi_irq(M32R_IRQ_SIO0_R);
@@ -112,7 +112,7 @@ void __init init_IRQ(void) 
	/* SIO0_S : uart send data */

	irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED;

	irq_desc[M32R_IRQ_SIO0_S].chip = &mappi_irq_type;

	irq_desc[M32R_IRQ_SIO0_S].action = 0;

	irq_desc[M32R_IRQ_SIO0_S].action = NULL;

	irq_desc[M32R_IRQ_SIO0_S].depth = 1;

	icu_data[M32R_IRQ_SIO0_S].icucr = 0;

	disable_mappi_irq(M32R_IRQ_SIO0_S);
@@ -120,7 +120,7 @@ void __init init_IRQ(void) 
	/* SIO1_R : uart receive data */

	irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED;

	irq_desc[M32R_IRQ_SIO1_R].chip = &mappi_irq_type;

	irq_desc[M32R_IRQ_SIO1_R].action = 0;

	irq_desc[M32R_IRQ_SIO1_R].action = NULL;

	irq_desc[M32R_IRQ_SIO1_R].depth = 1;

	icu_data[M32R_IRQ_SIO1_R].icucr = 0;

	disable_mappi_irq(M32R_IRQ_SIO1_R);
@@ -128,7 +128,7 @@ void __init init_IRQ(void) 
	/* SIO1_S : uart send data */

	irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED;

	irq_desc[M32R_IRQ_SIO1_S].chip = &mappi_irq_type;

	irq_desc[M32R_IRQ_SIO1_S].action = 0;

	irq_desc[M32R_IRQ_SIO1_S].action = NULL;

	irq_desc[M32R_IRQ_SIO1_S].depth = 1;

	icu_data[M32R_IRQ_SIO1_S].icucr = 0;

	disable_mappi_irq(M32R_IRQ_SIO1_S);
@@ -138,7 +138,7 @@ void __init init_IRQ(void) 
	/* INT1 : pccard0 interrupt */

	irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED;

	irq_desc[M32R_IRQ_INT1].chip = &mappi_irq_type;

	irq_desc[M32R_IRQ_INT1].action = 0;

	irq_desc[M32R_IRQ_INT1].action = NULL;

	irq_desc[M32R_IRQ_INT1].depth = 1;

	icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00;

	disable_mappi_irq(M32R_IRQ_INT1);
@@ -146,7 +146,7 @@ void __init init_IRQ(void) 
	/* INT2 : pccard1 interrupt */

	irq_desc[M32R_IRQ_INT2].status = IRQ_DISABLED;

	irq_desc[M32R_IRQ_INT2].chip = &mappi_irq_type;

	irq_desc[M32R_IRQ_INT2].action = 0;

	irq_desc[M32R_IRQ_INT2].action = NULL;

	irq_desc[M32R_IRQ_INT2].depth = 1;

	icu_data[M32R_IRQ_INT2].icucr = M32R_ICUCR_IEN | M32R_ICUCR_ISMOD00;

	disable_mappi_irq(M32R_IRQ_INT2);

arch/m32r/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ void smp_flush_tlb_all(void) 
	local_irq_save(flags);

	__flush_tlb_all();

	local_irq_restore(flags);

	smp_call_function(flush_tlb_all_ipi, 0, 1, 1);

	smp_call_function(flush_tlb_all_ipi, NULL, 1, 1);

	preempt_enable();

}

arch/m32r/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static __inline__ void do_trap(int trapnr, int signr, const char * str, 
#define DO_ERROR(trapnr, signr, str, name) \

asmlinkage void do_##name(struct pt_regs * regs, long error_code) \

{ \

	do_trap(trapnr, signr, 0, regs, error_code, NULL); \

	do_trap(trapnr, signr, NULL, regs, error_code, NULL); \

}



#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \