Skip to content

Commit

Permalink
x86: clean up struct irqaction initializers
Browse files Browse the repository at this point in the history
clean up struct irqaction initializers to C99.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Thomas Gleixner authored and Thomas Gleixner committed Oct 17, 2007
1 parent 6d43be8 commit 6a61f6a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
6 changes: 5 additions & 1 deletion arch/x86/kernel/i8259_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,11 @@ static irqreturn_t math_error_irq(int cpl, void *dev_id)
* New motherboards sometimes make IRQ 13 be a PCI interrupt,
* so allow interrupt sharing.
*/
static struct irqaction fpu_irq = { math_error_irq, 0, CPU_MASK_NONE, "fpu", NULL, NULL };
static struct irqaction fpu_irq = {
.handler = math_error_irq,
.mask = CPU_MASK_NONE,
.name = "fpu",
};

void __init init_ISA_irqs (void)
{
Expand Down
6 changes: 5 additions & 1 deletion arch/x86/mach-default/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ void __init pre_intr_init_hook(void)
/*
* IRQ2 is cascade interrupt to second interrupt controller
*/
static struct irqaction irq2 = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL};
static struct irqaction irq2 = {
.handler = no_action,
.mask = CPU_MASK_NONE,
.name = "cascade",
};

/**
* intr_init_hook - post gate setup interrupt initialisation
Expand Down
6 changes: 5 additions & 1 deletion arch/x86/mach-voyager/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ void __init pre_intr_init_hook(void)
/*
* IRQ2 is cascade interrupt to second interrupt controller
*/
static struct irqaction irq2 = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL};
static struct irqaction irq2 = {
.handler = no_action,
.mask = CPU_MASK_NONE,
.name = "cascade",
};

void __init intr_init_hook(void)
{
Expand Down

0 comments on commit 6a61f6a

Please sign in to comment.