Commit 2830e21e authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] PPC: C99 initializers for hw_interrupt_type structures 



Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 417ef531

arch/ppc/syslib/cpc700_pic.c

+4 −8
Original line number Diff line number Diff line
@@ -90,14 +90,10 @@ cpc700_mask_and_ack_irq(unsigned int irq) 
}



static struct hw_interrupt_type cpc700_pic = {

	"CPC700 PIC",

	NULL,

	NULL,

	cpc700_unmask_irq,

	cpc700_mask_irq,

	cpc700_mask_and_ack_irq,

	NULL,

	NULL

	.typename = "CPC700 PIC",

	.enable = cpc700_unmask_irq,

	.disable = cpc700_mask_irq,

	.ack = cpc700_mask_and_ack_irq,

};



__init static void

arch/ppc/syslib/i8259.c

+5 −8
Original line number Diff line number Diff line
@@ -129,14 +129,11 @@ static void i8259_end_irq(unsigned int irq) 
}



struct hw_interrupt_type i8259_pic = {

	" i8259    ",

	NULL,

	NULL,

	i8259_unmask_irq,

	i8259_mask_irq,

	i8259_mask_and_ack_irq,

	i8259_end_irq,

	NULL

	.typename = " i8259    ",

	.enable = i8259_unmask_irq,

	.disable = i8259_mask_irq,

	.ack = i8259_mask_and_ack_irq,

	.end = i8259_end_irq,

};



static struct resource pic1_iores = {

arch/ppc/syslib/open_pic2.c

+5 −7
Original line number Diff line number Diff line
@@ -82,13 +82,11 @@ static void openpic2_end_irq(unsigned int irq_nr); 
static void openpic2_ack_irq(unsigned int irq_nr);



struct hw_interrupt_type open_pic2 = {

	" OpenPIC2 ",

	NULL,

	NULL,

	openpic2_enable_irq,

	openpic2_disable_irq,

	openpic2_ack_irq,

	openpic2_end_irq,

	.typename = " OpenPIC2 ",

	.enable = openpic2_enable_irq,

	.disable = openpic2_disable_irq,

	.ack = openpic2_ack_irq,

	.end = openpic2_end_irq,

};



/*

arch/ppc/syslib/ppc403_pic.c

+4 −7
Original line number Diff line number Diff line
@@ -34,13 +34,10 @@ static void ppc403_aic_disable(unsigned int irq); 
static void ppc403_aic_disable_and_ack(unsigned int irq);



static struct hw_interrupt_type ppc403_aic = {

	"403GC AIC",

	NULL,

	NULL,

	ppc403_aic_enable,

	ppc403_aic_disable,

	ppc403_aic_disable_and_ack,

	0

	.typename = "403GC AIC",

	.enable = ppc403_aic_enable,

	.disable = ppc403_aic_disable,

	.ack = ppc403_aic_disable_and_ack,

};



int

arch/ppc/syslib/xilinx_pic.c

+5 −8
Original line number Diff line number Diff line
@@ -79,14 +79,11 @@ xilinx_intc_end(unsigned int irq) 
}



static struct hw_interrupt_type xilinx_intc = {

	"Xilinx Interrupt Controller",

	NULL,

	NULL,

	xilinx_intc_enable,

	xilinx_intc_disable,

	xilinx_intc_disable_and_ack,

	xilinx_intc_end,

	0

	.typename = "Xilinx Interrupt Controller",

	.enable = xilinx_intc_enable,

	.disable = xilinx_intc_disable,

	.ack = xilinx_intc_disable_and_ack,

	.end = xilinx_intc_end,

};



int