[PATCH 7/10] I386: C99 initializers for hw_interrupt_type structures

From: tglx
Date: Sat Feb 26 2005 - 19:22:59 EST


Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

---
kernel/i8259.c | 15 +++++++--------
mach-voyager/voyager_smp.c | 16 ++++++++--------
2 files changed, 15 insertions(+), 16 deletions(-)
---
diff -urN 2.6.11-rc5.orig/arch/i386/kernel/i8259.c 2.6.11-rc5/arch/i386/kernel/i8259.c
--- 2.6.11-rc5.orig/arch/i386/kernel/i8259.c 2005-01-24 12:25:33.000000000 +0100
+++ 2.6.11-rc5/arch/i386/kernel/i8259.c 2005-02-26 21:51:58.000000000 +0100
@@ -58,14 +58,13 @@
}

static struct hw_interrupt_type i8259A_irq_type = {
- "XT-PIC",
- startup_8259A_irq,
- shutdown_8259A_irq,
- enable_8259A_irq,
- disable_8259A_irq,
- mask_and_ack_8259A,
- end_8259A_irq,
- NULL
+ .typename = "XT-PIC",
+ .startup = startup_8259A_irq,
+ .shutdown = shutdown_8259A_irq,
+ .enable = enable_8259A_irq,
+ .disable = disable_8259A_irq,
+ .ack = mask_and_ack_8259A,
+ .end = end_8259A_irq,
};

/*
diff -urN 2.6.11-rc5.orig/arch/i386/mach-voyager/voyager_smp.c 2.6.11-rc5/arch/i386/mach-voyager/voyager_smp.c
--- 2.6.11-rc5.orig/arch/i386/mach-voyager/voyager_smp.c 2005-02-14 11:01:03.000000000 +0100
+++ 2.6.11-rc5/arch/i386/mach-voyager/voyager_smp.c 2005-02-26 20:54:19.000000000 +0100
@@ -210,14 +210,14 @@
* 8259 IRQs except that masks and things must be kept per processor
*/
static struct hw_interrupt_type vic_irq_type = {
- "VIC-level",
- startup_vic_irq, /* startup */
- disable_vic_irq, /* shutdown */
- enable_vic_irq, /* enable */
- disable_vic_irq, /* disable */
- before_handle_vic_irq, /* ack */
- after_handle_vic_irq, /* end */
- set_vic_irq_affinity, /* affinity */
+ .typename = "VIC-level",
+ .startup = startup_vic_irq,
+ .shutdown = disable_vic_irq,
+ .enable = enable_vic_irq,
+ .disable = disable_vic_irq,
+ .ack = before_handle_vic_irq,
+ .end = after_handle_vic_irq,
+ .set_affinity = set_vic_irq_affinity,
};

/* used to count up as CPUs are brought on line (starts at 0) */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/