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

[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
...@@ -90,14 +90,10 @@ cpc700_mask_and_ack_irq(unsigned int irq) ...@@ -90,14 +90,10 @@ cpc700_mask_and_ack_irq(unsigned int irq)
} }
static struct hw_interrupt_type cpc700_pic = { static struct hw_interrupt_type cpc700_pic = {
"CPC700 PIC", .typename = "CPC700 PIC",
NULL, .enable = cpc700_unmask_irq,
NULL, .disable = cpc700_mask_irq,
cpc700_unmask_irq, .ack = cpc700_mask_and_ack_irq,
cpc700_mask_irq,
cpc700_mask_and_ack_irq,
NULL,
NULL
}; };
__init static void __init static void
......
...@@ -129,14 +129,11 @@ static void i8259_end_irq(unsigned int irq) ...@@ -129,14 +129,11 @@ static void i8259_end_irq(unsigned int irq)
} }
struct hw_interrupt_type i8259_pic = { struct hw_interrupt_type i8259_pic = {
" i8259 ", .typename = " i8259 ",
NULL, .enable = i8259_unmask_irq,
NULL, .disable = i8259_mask_irq,
i8259_unmask_irq, .ack = i8259_mask_and_ack_irq,
i8259_mask_irq, .end = i8259_end_irq,
i8259_mask_and_ack_irq,
i8259_end_irq,
NULL
}; };
static struct resource pic1_iores = { static struct resource pic1_iores = {
......
...@@ -82,13 +82,11 @@ static void openpic2_end_irq(unsigned int irq_nr); ...@@ -82,13 +82,11 @@ static void openpic2_end_irq(unsigned int irq_nr);
static void openpic2_ack_irq(unsigned int irq_nr); static void openpic2_ack_irq(unsigned int irq_nr);
struct hw_interrupt_type open_pic2 = { struct hw_interrupt_type open_pic2 = {
" OpenPIC2 ", .typename = " OpenPIC2 ",
NULL, .enable = openpic2_enable_irq,
NULL, .disable = openpic2_disable_irq,
openpic2_enable_irq, .ack = openpic2_ack_irq,
openpic2_disable_irq, .end = openpic2_end_irq,
openpic2_ack_irq,
openpic2_end_irq,
}; };
/* /*
......
...@@ -34,13 +34,10 @@ static void ppc403_aic_disable(unsigned int irq); ...@@ -34,13 +34,10 @@ static void ppc403_aic_disable(unsigned int irq);
static void ppc403_aic_disable_and_ack(unsigned int irq); static void ppc403_aic_disable_and_ack(unsigned int irq);
static struct hw_interrupt_type ppc403_aic = { static struct hw_interrupt_type ppc403_aic = {
"403GC AIC", .typename = "403GC AIC",
NULL, .enable = ppc403_aic_enable,
NULL, .disable = ppc403_aic_disable,
ppc403_aic_enable, .ack = ppc403_aic_disable_and_ack,
ppc403_aic_disable,
ppc403_aic_disable_and_ack,
0
}; };
int int
......
...@@ -79,14 +79,11 @@ xilinx_intc_end(unsigned int irq) ...@@ -79,14 +79,11 @@ xilinx_intc_end(unsigned int irq)
} }
static struct hw_interrupt_type xilinx_intc = { static struct hw_interrupt_type xilinx_intc = {
"Xilinx Interrupt Controller", .typename = "Xilinx Interrupt Controller",
NULL, .enable = xilinx_intc_enable,
NULL, .disable = xilinx_intc_disable,
xilinx_intc_enable, .ack = xilinx_intc_disable_and_ack,
xilinx_intc_disable, .end = xilinx_intc_end,
xilinx_intc_disable_and_ack,
xilinx_intc_end,
0
}; };
int int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment