Skip to contentSkip to conversation

PPC: C99 initializers for hw_interrupt_type structures

PATCH Applied [email protected] 3 participants 12 messages Feb 27, 2005 – Feb 28, 2005

Subsystems (3)
MIPS SuperH Arm/Zynq architecture
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/10 PPC: C99 initializers for hw_interrupt_type structures

Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by Thomas Gleixner <[email protected]>
---
 platforms/adir_pic.c |   12 ++++--------
 syslib/cpc700_pic.c  |   12 ++++--------
 syslib/cpm2_pic.c    |   13 +++++--------
 syslib/i8259.c       |   13 +++++--------
 syslib/mpc52xx_pic.c |   13 +++++--------
 syslib/open_pic2.c   |   12 +++++-------
 syslib/ppc403_pic.c  |   11 ++++-------
 syslib/xilinx_pic.c  |   13 +++++--------
 8 files changed, 37 insertions(+), 62 deletions(-)

---

arch/ppc/platforms/adir_pic.c +4 -8
diff -urN 2.6.11-rc5.orig/arch/ppc/platforms/adir_pic.c 2.6.11-rc5/arch/ppc/platforms/adir_pic.c
@@ -73,14 +73,10 @@
 }
 
 static struct hw_interrupt_type adir_onboard_pic = {
-	" ADIR PIC ",
-	NULL,
-	NULL,
-	adir_onboard_pic_enable,		/* unmask */
-	adir_onboard_pic_disable,		/* mask */
-	adir_onboard_pic_disable,		/* mask and ack */
-	NULL,
-	NULL
+	.typename = " ADIR PIC ",
+	.enable = adir_onboard_pic_enable,	/* unmask */
+	.disable = adir_onboard_pic_disable,	/* mask */
+	.ack = adir_onboard_pic_disable,	/* mask and ack */
 };
 
 static struct irqaction noop_action = {
arch/ppc/syslib/cpc700_pic.c +4 -8
diff -urN 2.6.11-rc5.orig/arch/ppc/syslib/cpc700_pic.c 2.6.11-rc5/arch/ppc/syslib/cpc700_pic.c
@@ -90,14 +90,10 @@
 }
 
 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/cpm2_pic.c +5 -8
diff -urN 2.6.11-rc5.orig/arch/ppc/syslib/cpm2_pic.c 2.6.11-rc5/arch/ppc/syslib/cpm2_pic.c
@@ -102,14 +102,11 @@
 }
 
 struct hw_interrupt_type cpm2_pic = {
-	" CPM2 SIU  ",
-	NULL,
-	NULL,
-	cpm2_unmask_irq,
-	cpm2_mask_irq,
-	cpm2_mask_and_ack,
-	cpm2_end_irq,
-	0
+	.typename = " CPM2 SIU  ",
+	.enable = cpm2_unmask_irq,
+	.disable = cpm2_mask_irq,
+	.ack = cpm2_mask_and_ack,
+	.end = cpm2_end_irq,
 };
arch/ppc/syslib/i8259.c +5 -8
diff -urN 2.6.11-rc5.orig/arch/ppc/syslib/i8259.c 2.6.11-rc5/arch/ppc/syslib/i8259.c
@@ -129,14 +129,11 @@
 }
 
 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/mpc52xx_pic.c +5 -8
diff -urN 2.6.11-rc5.orig/arch/ppc/syslib/mpc52xx_pic.c 2.6.11-rc5/arch/ppc/syslib/mpc52xx_pic.c
@@ -166,14 +166,11 @@
 }
 
 static struct hw_interrupt_type mpc52xx_ic = {
-	"MPC52xx",
-	NULL,				/* startup(irq) */
-	NULL,				/* shutdown(irq) */
-	mpc52xx_ic_enable,		/* enable(irq) */
-	mpc52xx_ic_disable,		/* disable(irq) */
-	mpc52xx_ic_disable_and_ack,	/* disable_and_ack(irq) */
-	mpc52xx_ic_end,			/* end(irq) */
-	0				/* set_affinity(irq, cpumask) SMP. */
+	.typename = "MPC52xx",
+	.enable = mpc52xx_ic_enable,		/* enable(irq) */
+	.disable = mpc52xx_ic_disable,		/* disable(irq) */
+	.ack = mpc52xx_ic_disable_and_ack,	/* disable_and_ack(irq) */
+	.end = mpc52xx_ic_end,			/* end(irq) */
 };
 
 void __init
arch/ppc/syslib/open_pic2.c +5 -7
diff -urN 2.6.11-rc5.orig/arch/ppc/syslib/open_pic2.c 2.6.11-rc5/arch/ppc/syslib/open_pic2.c
@@ -83,13 +83,11 @@
 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
diff -urN 2.6.11-rc5.orig/arch/ppc/syslib/ppc403_pic.c 2.6.11-rc5/arch/ppc/syslib/ppc403_pic.c
@@ -34,13 +34,10 @@
 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
diff -urN 2.6.11-rc5.orig/arch/ppc/syslib/xilinx_pic.c 2.6.11-rc5/arch/ppc/syslib/xilinx_pic.c
@@ -79,14 +79,11 @@
 }
 
 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
author
#1 lore raw

PATCH 2/10 M32R: C99 initializers for hw_interrupt_type structures

Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by Thomas Gleixner <[email protected]>
---
 setup_m32700ut.c |   56 +++++++++++++++++++++++++++----------------------------
 setup_mappi.c    |   14 ++++++-------
 setup_mappi2.c   |   14 ++++++-------
 setup_oaks32r.c  |   14 ++++++-------
 setup_opsput.c   |   56 +++++++++++++++++++++++++++----------------------------
 setup_usrv.c     |   28 +++++++++++++--------------
 6 files changed, 91 insertions(+), 91 deletions(-)

---

arch/m32r/kernel/setup_m32700ut.c +28 -28
diff -urN 2.6.11-rc5.orig/arch/m32r/kernel/setup_m32700ut.c 2.6.11-rc5/arch/m32r/kernel/setup_m32700ut.c
@@ -78,13 +78,13 @@
 
 static struct hw_interrupt_type m32700ut_irq_type =
 {
-	"M32700UT-IRQ",
-	startup_m32700ut_irq,
-	shutdown_m32700ut_irq,
-	enable_m32700ut_irq,
-	disable_m32700ut_irq,
-	mask_and_ack_m32700ut,
-	end_m32700ut_irq
+	.typename = "M32700UT-IRQ",
+	.startup = startup_m32700ut_irq,
+	.shutdown = shutdown_m32700ut_irq,
+	.enable = enable_m32700ut_irq,
+	.disable = disable_m32700ut_irq,
+	.ack = mask_and_ack_m32700ut,
+	.end = end_m32700ut_irq
 };
 
 /*

@@ -155,13 +155,13 @@
 
 static struct hw_interrupt_type m32700ut_pld_irq_type =
 {
-	"M32700UT-PLD-IRQ",
-	startup_m32700ut_pld_irq,
-	shutdown_m32700ut_pld_irq,
-	enable_m32700ut_pld_irq,
-	disable_m32700ut_pld_irq,
-	mask_and_ack_m32700ut_pld,
-	end_m32700ut_pld_irq
+	.typename = "M32700UT-PLD-IRQ",
+	.startup = startup_m32700ut_pld_irq,
+	.shutdown = shutdown_m32700ut_pld_irq,
+	.enable = enable_m32700ut_pld_irq,
+	.disable = disable_m32700ut_pld_irq,
+	.ack = mask_and_ack_m32700ut_pld,
+	.end = end_m32700ut_pld_irq
 };
 
 /*

@@ -224,13 +224,13 @@
 
 static struct hw_interrupt_type m32700ut_lanpld_irq_type =
 {
-	"M32700UT-PLD-LAN-IRQ",
-	startup_m32700ut_lanpld_irq,
-	shutdown_m32700ut_lanpld_irq,
-	enable_m32700ut_lanpld_irq,
-	disable_m32700ut_lanpld_irq,
-	mask_and_ack_m32700ut_lanpld,
-	end_m32700ut_lanpld_irq
+	.typename = "M32700UT-PLD-LAN-IRQ",
+	.startup = startup_m32700ut_lanpld_irq,
+	.shutdown = shutdown_m32700ut_lanpld_irq,
+	.enable = enable_m32700ut_lanpld_irq,
+	.disable = disable_m32700ut_lanpld_irq,
+	.ack = mask_and_ack_m32700ut_lanpld,
+	.end = end_m32700ut_lanpld_irq
 };
 
 /*

@@ -293,13 +293,13 @@
 
 static struct hw_interrupt_type m32700ut_lcdpld_irq_type =
 {
-	"M32700UT-PLD-LCD-IRQ",
-	startup_m32700ut_lcdpld_irq,
-	shutdown_m32700ut_lcdpld_irq,
-	enable_m32700ut_lcdpld_irq,
-	disable_m32700ut_lcdpld_irq,
-	mask_and_ack_m32700ut_lcdpld,
-	end_m32700ut_lcdpld_irq
+	.typename = "M32700UT-PLD-LCD-IRQ",
+	.startup = startup_m32700ut_lcdpld_irq,
+	.shutdown = shutdown_m32700ut_lcdpld_irq,
+	.enable = enable_m32700ut_lcdpld_irq,
+	.disable = disable_m32700ut_lcdpld_irq,
+	.ack = mask_and_ack_m32700ut_lcdpld,
+	.end = end_m32700ut_lcdpld_irq
 };
 
 void __init init_IRQ(void)
arch/m32r/kernel/setup_mappi2.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/m32r/kernel/setup_mappi2.c 2.6.11-rc5/arch/m32r/kernel/setup_mappi2.c
@@ -79,13 +79,13 @@
 
 static struct hw_interrupt_type mappi2_irq_type =
 {
-	"MAPPI2-IRQ",
-	startup_mappi2_irq,
-	shutdown_mappi2_irq,
-	enable_mappi2_irq,
-	disable_mappi2_irq,
-	mask_and_ack_mappi2,
-	end_mappi2_irq
+	.typename = "MAPPI2-IRQ",
+	.startup = startup_mappi2_irq,
+	.shutdown = shutdown_mappi2_irq,
+	.enable = enable_mappi2_irq,
+	.disable = disable_mappi2_irq,
+	.ack = mask_and_ack_mappi2,
+	.end = end_mappi2_irq
 };
 
 void __init init_IRQ(void)
arch/m32r/kernel/setup_mappi.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/m32r/kernel/setup_mappi.c 2.6.11-rc5/arch/m32r/kernel/setup_mappi.c
@@ -70,13 +70,13 @@
 
 static struct hw_interrupt_type mappi_irq_type =
 {
-	"MAPPI-IRQ",
-	startup_mappi_irq,
-	shutdown_mappi_irq,
-	enable_mappi_irq,
-	disable_mappi_irq,
-	mask_and_ack_mappi,
-	end_mappi_irq
+	.typename = "MAPPI-IRQ",
+	.startup = startup_mappi_irq,
+	.shutdown = shutdown_mappi_irq,
+	.enable = enable_mappi_irq,
+	.disable = disable_mappi_irq,
+	.ack = mask_and_ack_mappi,
+	.end = end_mappi_irq
 };
 
 void __init init_IRQ(void)
arch/m32r/kernel/setup_oaks32r.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/m32r/kernel/setup_oaks32r.c 2.6.11-rc5/arch/m32r/kernel/setup_oaks32r.c
@@ -70,13 +70,13 @@
 
 static struct hw_interrupt_type oaks32r_irq_type =
 {
-	"OAKS32R-IRQ",
-	startup_oaks32r_irq,
-	shutdown_oaks32r_irq,
-	enable_oaks32r_irq,
-	disable_oaks32r_irq,
-	mask_and_ack_mappi,
-	end_oaks32r_irq
+	.typename = "OAKS32R-IRQ",
+	.startup = startup_oaks32r_irq,
+	.shutdown = shutdown_oaks32r_irq,
+	.enable = enable_oaks32r_irq,
+	.disable = disable_oaks32r_irq,
+	.ack = mask_and_ack_mappi,
+	.end = end_oaks32r_irq
 };
 
 void __init init_IRQ(void)
arch/m32r/kernel/setup_opsput.c +28 -28

80 lines not on this page · raw message

arch/m32r/kernel/setup_usrv.c +14 -14
diff -urN 2.6.11-rc5.orig/arch/m32r/kernel/setup_usrv.c 2.6.11-rc5/arch/m32r/kernel/setup_usrv.c
@@ -70,13 +70,13 @@
 
 static struct hw_interrupt_type mappi_irq_type =
 {
-	"M32700-IRQ",
-	startup_mappi_irq,
-	shutdown_mappi_irq,
-	enable_mappi_irq,
-	disable_mappi_irq,
-	mask_and_ack_mappi,
-	end_mappi_irq
+	.typename = "M32700-IRQ",
+	.startup = startup_mappi_irq,
+	.shutdown = shutdown_mappi_irq,
+	.enable = enable_mappi_irq,
+	.disable = disable_mappi_irq,
+	.ack = mask_and_ack_mappi,
+	.end = end_mappi_irq
 };
 
 /*

@@ -143,13 +143,13 @@
 
 static struct hw_interrupt_type m32700ut_pld_irq_type =
 {
-	"USRV-PLD-IRQ",
-	startup_m32700ut_pld_irq,
-	shutdown_m32700ut_pld_irq,
-	enable_m32700ut_pld_irq,
-	disable_m32700ut_pld_irq,
-	mask_and_ack_m32700ut_pld,
-	end_m32700ut_pld_irq
+	.typename = "USRV-PLD-IRQ",
+	.startup = startup_m32700ut_pld_irq,
+	.shutdown = shutdown_m32700ut_pld_irq,
+	.enable = enable_m32700ut_pld_irq,
+	.disable = disable_m32700ut_pld_irq,
+	.ack = mask_and_ack_m32700ut_pld,
+	.end = end_m32700ut_pld_irq
 };
 
 void __init init_IRQ(void)
author
#2 lore raw

PATCH 3/10 SH: C99 initializers for hw_interrupt_type structures

In reply to [email protected]

Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by Thomas Gleixner <[email protected]>
---
 boards/adx/irq_maskreg.c         |   14 +++++++-------
 boards/bigsur/irq.c              |   28 ++++++++++++++--------------
 boards/cqreek/irq.c              |   14 +++++++-------
 boards/harp/irq.c                |   14 +++++++-------
 boards/overdrive/irq.c           |   14 +++++++-------
 boards/renesas/hs7751rvoip/irq.c |   14 +++++++-------
 boards/renesas/rts7751r2d/irq.c  |   14 +++++++-------
 boards/renesas/systemh/irq.c     |   14 +++++++-------
 boards/superh/microdev/irq.c     |   14 +++++++-------
 cchips/voyagergx/irq.c           |   14 +++++++-------
 kernel/cpu/irq_imask.c           |   14 +++++++-------
 kernel/cpu/irq_ipr.c             |   28 ++++++++++++++--------------
 kernel/cpu/sh4/irq_intc2.c       |   14 +++++++-------
 kernel/irq.c                     |   14 +++++++-------
 14 files changed, 112 insertions(+), 112 deletions(-)

---

arch/sh/boards/adx/irq_maskreg.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/boards/adx/irq_maskreg.c 2.6.11-rc5/arch/sh/boards/adx/irq_maskreg.c
@@ -37,13 +37,13 @@
 
 /* hw_interrupt_type */
 static struct hw_interrupt_type maskreg_irq_type = {
-	" Mask Register",
-	startup_maskreg_irq,
-	shutdown_maskreg_irq,
-	enable_maskreg_irq,
-	disable_maskreg_irq,
-	mask_and_ack_maskreg,
-	end_maskreg_irq
+	.typename = " Mask Register",
+	.startup = startup_maskreg_irq,
+	.shutdown = shutdown_maskreg_irq,
+	.enable = enable_maskreg_irq,
+	.disable = disable_maskreg_irq,
+	.ack = mask_and_ack_maskreg,
+	.end = end_maskreg_irq
 };
 
 /* actual implementatin */
arch/sh/boards/bigsur/irq.c +14 -14
diff -urN 2.6.11-rc5.orig/arch/sh/boards/bigsur/irq.c 2.6.11-rc5/arch/sh/boards/bigsur/irq.c
@@ -228,23 +228,23 @@
 
 /* Define the IRQ structures for the L1 and L2 IRQ types */
 static struct hw_interrupt_type bigsur_l1irq_type = {
-        "BigSur-CPLD-Level1-IRQ",
-        startup_bigsur_irq,
-        shutdown_bigsur_irq,
-        enable_bigsur_l1irq,
-        disable_bigsur_l1irq,
-        mask_and_ack_bigsur,
-        end_bigsur_irq
+	.typename  = "BigSur-CPLD-Level1-IRQ",
+	.startup = startup_bigsur_irq,
+	.shutdown = shutdown_bigsur_irq,
+	.enable = enable_bigsur_l1irq,
+	.disable = disable_bigsur_l1irq,
+	.ack = mask_and_ack_bigsur,
+	.end = end_bigsur_irq
 };
 
 static struct hw_interrupt_type bigsur_l2irq_type = {
-        "BigSur-CPLD-Level2-IRQ",
-        startup_bigsur_irq,
-        shutdown_bigsur_irq,
-        enable_bigsur_l2irq,
-        disable_bigsur_l2irq,
-        mask_and_ack_bigsur,
-        end_bigsur_irq
+	.typename  = "BigSur-CPLD-Level2-IRQ",
+	.startup = startup_bigsur_irq,
+	.shutdown  =shutdown_bigsur_irq,
+	.enable = enable_bigsur_l2irq,
+	.disable = disable_bigsur_l2irq,
+	.ack = mask_and_ack_bigsur,
+	.end = end_bigsur_irq
 };
arch/sh/boards/cqreek/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/boards/cqreek/irq.c 2.6.11-rc5/arch/sh/boards/cqreek/irq.c
@@ -83,13 +83,13 @@
 }
 
 static struct hw_interrupt_type cqreek_irq_type = {
-	"CqREEK-IRQ",
-	startup_cqreek_irq,
-	shutdown_cqreek_irq,
-	enable_cqreek_irq,
-	disable_cqreek_irq,
-	mask_and_ack_cqreek,
-	end_cqreek_irq
+	.typename = "CqREEK-IRQ",
+	.startup = startup_cqreek_irq,
+	.shutdown = shutdown_cqreek_irq,
+	.enable = enable_cqreek_irq,
+	.disable = disable_cqreek_irq,
+	.ack = mask_and_ack_cqreek,
+	.end = end_cqreek_irq
 };
 
 int cqreek_has_ide, cqreek_has_isa;
arch/sh/boards/harp/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/boards/harp/irq.c 2.6.11-rc5/arch/sh/boards/harp/irq.c
@@ -39,13 +39,13 @@
 }
 
 static struct hw_interrupt_type harp_irq_type = {
-	"Harp-IRQ",
-	startup_harp_irq,
-	shutdown_harp_irq,
-	enable_harp_irq,
-	disable_harp_irq,
-	mask_and_ack_harp,
-	end_harp_irq
+	.typename = "Harp-IRQ",
+	.startup = startup_harp_irq,
+	.shutdown = shutdown_harp_irq,
+	.enable = enable_harp_irq,
+	.disable = disable_harp_irq,
+	.ack = mask_and_ack_harp,
+	.end = end_harp_irq
 };
 
 static void disable_harp_irq(unsigned int irq)
arch/sh/boards/overdrive/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/boards/overdrive/irq.c 2.6.11-rc5/arch/sh/boards/overdrive/irq.c
@@ -86,13 +86,13 @@
 }
 
 static struct hw_interrupt_type od_irq_type = {
-	"Overdrive-IRQ",
-	startup_od_irq,
-	shutdown_od_irq,
-	enable_od_irq,
-	disable_od_irq,
-	mask_and_ack_od,
-	end_od_irq
+	.typename = "Overdrive-IRQ",
+	.startup = startup_od_irq,
+	.shutdown = shutdown_od_irq,
+	.enable = enable_od_irq,
+	.disable = disable_od_irq,
+	.ack = mask_and_ack_od,
+	.end = end_od_irq
 };
 
 static void disable_od_irq(unsigned int irq)
arch/sh/boards/renesas/hs7751rvoip/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/boards/renesas/hs7751rvoip/irq.c 2.6.11-rc5/arch/sh/boards/renesas/hs7751rvoip/irq.c
@@ -74,13 +74,13 @@
 }
 
 static struct hw_interrupt_type hs7751rvoip_irq_type = {
-	"HS7751RVoIP IRQ",
-	startup_hs7751rvoip_irq,
-	shutdown_hs7751rvoip_irq,
-	enable_hs7751rvoip_irq,
-	disable_hs7751rvoip_irq,
-	ack_hs7751rvoip_irq,
-	end_hs7751rvoip_irq,
+	.typename =  "HS7751RVoIP IRQ",
+	.startup = startup_hs7751rvoip_irq,
+	.shutdown = shutdown_hs7751rvoip_irq,
+	.enable = enable_hs7751rvoip_irq,
+	.disable = disable_hs7751rvoip_irq,
+	.ack = ack_hs7751rvoip_irq,
+	.end = end_hs7751rvoip_irq,
 };
 
 static void make_hs7751rvoip_irq(unsigned int irq)
arch/sh/boards/renesas/rts7751r2d/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/boards/renesas/rts7751r2d/irq.c 2.6.11-rc5/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -88,13 +88,13 @@
 }
 
 static struct hw_interrupt_type rts7751r2d_irq_type = {
-	"RTS7751R2D IRQ",
-	startup_rts7751r2d_irq,
-	shutdown_rts7751r2d_irq,
-	enable_rts7751r2d_irq,
-	disable_rts7751r2d_irq,
-	ack_rts7751r2d_irq,
-	end_rts7751r2d_irq,
+	.typename = "RTS7751R2D IRQ",
+	.startup = startup_rts7751r2d_irq,
+	.shutdown = shutdown_rts7751r2d_irq,
+	.enable = enable_rts7751r2d_irq,
+	.disable = disable_rts7751r2d_irq,
+	.ack = ack_rts7751r2d_irq,
+	.end = end_rts7751r2d_irq,
 };
 
 static void make_rts7751r2d_irq(unsigned int irq)
arch/sh/boards/renesas/systemh/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/boards/renesas/systemh/irq.c 2.6.11-rc5/arch/sh/boards/renesas/systemh/irq.c
@@ -35,13 +35,13 @@
 
 /* hw_interrupt_type */
 static struct hw_interrupt_type systemh_irq_type = {
-	" SystemH Register",
-	startup_systemh_irq,
-	shutdown_systemh_irq,
-	enable_systemh_irq,
-	disable_systemh_irq,
-	mask_and_ack_systemh,
-	end_systemh_irq
+	.typename = " SystemH Register",
+	.startup = startup_systemh_irq,
+	.shutdown = shutdown_systemh_irq,
+	.enable = enable_systemh_irq,
+	.disable = disable_systemh_irq,
+	.ack = mask_and_ack_systemh,
+	.end = end_systemh_irq
 };
 
 static unsigned int startup_systemh_irq(unsigned int irq)
arch/sh/boards/superh/microdev/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/boards/superh/microdev/irq.c 2.6.11-rc5/arch/sh/boards/superh/microdev/irq.c
@@ -83,13 +83,13 @@
 }
 
 static struct hw_interrupt_type microdev_irq_type = {
-	"MicroDev-IRQ",
-	startup_microdev_irq,
-	shutdown_microdev_irq,
-	enable_microdev_irq,
-	disable_microdev_irq,
-	mask_and_ack_microdev,
-	end_microdev_irq
+	.typename = "MicroDev-IRQ",
+	.startup = startup_microdev_irq,
+	.shutdown = shutdown_microdev_irq,
+	.enable = enable_microdev_irq,
+	.disable = disable_microdev_irq,
+	.ack = mask_and_ack_microdev,
+	.end = end_microdev_irq
 };
 
 static void disable_microdev_irq(unsigned int irq)
arch/sh/cchips/voyagergx/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/cchips/voyagergx/irq.c 2.6.11-rc5/arch/sh/cchips/voyagergx/irq.c
@@ -87,13 +87,13 @@
 }
 
 static struct hw_interrupt_type voyagergx_irq_type = {
-	"VOYAGERGX-IRQ",
-	startup_voyagergx_irq,
-	shutdown_voyagergx_irq,
-	enable_voyagergx_irq,
-	disable_voyagergx_irq,
-	mask_and_ack_voyagergx,
-	end_voyagergx_irq,
+	.typename = "VOYAGERGX-IRQ",
+	.startup = startup_voyagergx_irq,
+	.shutdown = shutdown_voyagergx_irq,
+	.enable = enable_voyagergx_irq,
+	.disable = disable_voyagergx_irq,
+	.ack = mask_and_ack_voyagergx,
+	.end = end_voyagergx_irq,
 };
 
 static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
arch/sh/kernel/cpu/irq_imask.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/kernel/cpu/irq_imask.c 2.6.11-rc5/arch/sh/kernel/cpu/irq_imask.c
@@ -46,13 +46,13 @@
 }
 
 static struct hw_interrupt_type imask_irq_type = {
-	"SR.IMASK",
-	startup_imask_irq,
-	shutdown_imask_irq,
-	enable_imask_irq,
-	disable_imask_irq,
-	mask_and_ack_imask,
-	end_imask_irq
+	.typename = "SR.IMASK",
+	.startup = startup_imask_irq,
+	.shutdown = shutdown_imask_irq,
+	.enable = enable_imask_irq,
+	.disable = disable_imask_irq,
+	.ack = mask_and_ack_imask,
+	.end = end_imask_irq
 };
 
 void static inline set_interrupt_registers(int ip)
arch/sh/kernel/cpu/irq_ipr.c +14 -14
diff -urN 2.6.11-rc5.orig/arch/sh/kernel/cpu/irq_ipr.c 2.6.11-rc5/arch/sh/kernel/cpu/irq_ipr.c
@@ -48,13 +48,13 @@
 }
 
 static struct hw_interrupt_type ipr_irq_type = {
-	"IPR-IRQ",
-	startup_ipr_irq,
-	shutdown_ipr_irq,
-	enable_ipr_irq,
-	disable_ipr_irq,
-	mask_and_ack_ipr,
-	end_ipr_irq
+	.typename = "IPR-IRQ",
+	.startup = startup_ipr_irq,
+	.shutdown = shutdown_ipr_irq,
+	.enable = enable_ipr_irq,
+	.disable = disable_ipr_irq,
+	.ack = mask_and_ack_ipr,
+	.end = end_ipr_irq
 };
 
 static void disable_ipr_irq(unsigned int irq)

@@ -142,13 +142,13 @@
 }
 
 static struct hw_interrupt_type pint_irq_type = {
-	"PINT-IRQ",
-	startup_pint_irq,
-	shutdown_pint_irq,
-	enable_pint_irq,
-	disable_pint_irq,
-	mask_and_ack_pint,
-	end_pint_irq
+	.typename = "PINT-IRQ",
+	.startup = startup_pint_irq,
+	.shutdown = shutdown_pint_irq,
+	.enable = enable_pint_irq,
+	.disable = disable_pint_irq,
+	.ack = mask_and_ack_pint,
+	.end = end_pint_irq
 };
 
 static void disable_pint_irq(unsigned int irq)
arch/sh/kernel/cpu/sh4/irq_intc2.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/kernel/cpu/sh4/irq_intc2.c 2.6.11-rc5/arch/sh/kernel/cpu/sh4/irq_intc2.c
@@ -48,13 +48,13 @@
 }
 
 static struct hw_interrupt_type intc2_irq_type = {
-	"INTC2-IRQ",
-	startup_intc2_irq,
-	shutdown_intc2_irq,
-	enable_intc2_irq,
-	disable_intc2_irq,
-	mask_and_ack_intc2,
-	end_intc2_irq
+	.typename = "INTC2-IRQ",
+	.startup = startup_intc2_irq,
+	.shutdown = shutdown_intc2_irq,
+	.enable = enable_intc2_irq,
+	.disable = disable_intc2_irq,
+	.ack = mask_and_ack_intc2,
+	.end = end_intc2_irq
 };
 
 static void disable_intc2_irq(unsigned int irq)
arch/sh/kernel/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh/kernel/irq.c 2.6.11-rc5/arch/sh/kernel/irq.c
@@ -79,13 +79,13 @@
 #define end_none	enable_none
 
 struct hw_interrupt_type no_irq_type = {
-	"none",
-	startup_none,
-	shutdown_none,
-	enable_none,
-	disable_none,
-	ack_none,
-	end_none
+	.typename = "none",
+	.startup = startup_none,
+	.shutdown = shutdown_none,
+	.enable = enable_none,
+	.disable = disable_none,
+	.ack = ack_none,
+	.end = end_none
 };
 
 /*
author
#3 lore raw

PATCH 4/10 PPC64: C99 initializers for hw_interrupt_type structures

In reply to [email protected]

Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by Thomas Gleixner <[email protected]>
---
 i8259.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

---

arch/ppc64/kernel/i8259.c +5 -8
diff -urN 2.6.11-rc5.orig/arch/ppc64/kernel/i8259.c 2.6.11-rc5/arch/ppc64/kernel/i8259.c
@@ -131,14 +131,11 @@
 }
 
 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,
 };
 
 void __init i8259_init(int offset)
author
#4 lore raw

PATCH 5/10 MIPS: C99 initializers for hw_interrupt_type structures

In reply to [email protected]

Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by Thomas Gleixner <[email protected]>
---
 au1000/common/irq.c           |   60 +++++++++++++++------------------
 ddb5xxx/ddb5074/nile4_pic.c   |   15 +++-----
 ddb5xxx/ddb5476/vrc5476_irq.c |   15 +++-----
 ddb5xxx/ddb5477/irq_5477.c    |   15 +++-----
 ite-boards/generic/irq.c      |   29 +++++++---------
 jazz/irq.c                    |   15 +++-----
 jmr3927/rbhma3100/irq.c       |   14 +++----
 kernel/i8259.c                |   15 +++-----
 kernel/irq-msc01.c            |   30 +++++++---------
 kernel/irq-mv6434x.c          |   15 +++-----
 kernel/irq-rm7000.c           |   14 +++----
 kernel/irq-rm9000.c           |   28 +++++++--------
 kernel/irq_cpu.c              |   15 +++-----
 lasat/interrupt.c             |   15 +++-----
 mips-boards/atlas/atlas_int.c |   15 +++-----
 momentum/ocelot_c/cpci-irq.c  |   15 +++-----
 momentum/ocelot_c/uart-irq.c  |   15 +++-----
 sgi-ip32/ip32-irq.c           |   75 +++++++++++++++++++-----------------------
 sibyte/sb1250/irq.c           |   18 ++++------
 sni/irq.c                     |   15 +++-----
 vr4181/common/irq.c           |   30 +++++++---------
 21 files changed, 225 insertions(+), 253 deletions(-)

---

arch/mips/au1000/common/irq.c +28 -32
diff -urN 2.6.11-rc5.orig/arch/mips/au1000/common/irq.c 2.6.11-rc5/arch/mips/au1000/common/irq.c
@@ -253,47 +253,43 @@
 
 
 static struct hw_interrupt_type rise_edge_irq_type = {
-	"Au1000 Rise Edge",
-	startup_irq,
-	shutdown_irq,
-	local_enable_irq,
-	local_disable_irq,
-	mask_and_ack_rise_edge_irq,
-	end_irq,
-	NULL
+	.typename = "Au1000 Rise Edge",
+	.startup = startup_irq,
+	.shutdown = shutdown_irq,
+	.enable = local_enable_irq,
+	.disable = local_disable_irq,
+	.ack = mask_and_ack_rise_edge_irq,
+	.end = end_irq,
 };
 
 static struct hw_interrupt_type fall_edge_irq_type = {
-	"Au1000 Fall Edge",
-	startup_irq,
-	shutdown_irq,
-	local_enable_irq,
-	local_disable_irq,
-	mask_and_ack_fall_edge_irq,
-	end_irq,
-	NULL
+	.typename = "Au1000 Fall Edge",
+	.startup = startup_irq,
+	.shutdown = shutdown_irq,
+	.enable = local_enable_irq,
+	.disable = local_disable_irq,
+	.ack = mask_and_ack_fall_edge_irq,
+	.end = end_irq,
 };
 
 static struct hw_interrupt_type either_edge_irq_type = {
-	"Au1000 Rise or Fall Edge",
-	startup_irq,
-	shutdown_irq,
-	local_enable_irq,
-	local_disable_irq,
-	mask_and_ack_either_edge_irq,
-	end_irq,
-	NULL
+	.typename = "Au1000 Rise or Fall Edge",
+	.startup = startup_irq,
+	.shutdown = shutdown_irq,
+	.enable = local_enable_irq,
+	.disable = local_disable_irq,
+	.ack = mask_and_ack_either_edge_irq,
+	.end = end_irq,
 };
 
 static struct hw_interrupt_type level_irq_type = {
-	"Au1000 Level",
-	startup_irq,
-	shutdown_irq,
-	local_enable_irq,
-	local_disable_irq,
-	mask_and_ack_level_irq,
-	end_irq,
-	NULL
+	.typename = "Au1000 Level",
+	.startup = startup_irq,
+	.shutdown = shutdown_irq,
+	.enable = local_enable_irq,
+	.disable = local_disable_irq,
+	.ack = mask_and_ack_level_irq,
+	.end = end_irq,
 };
 
 #ifdef CONFIG_PM
arch/mips/ddb5xxx/ddb5074/nile4_pic.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/ddb5xxx/ddb5074/nile4_pic.c 2.6.11-rc5/arch/mips/ddb5xxx/ddb5074/nile4_pic.c
@@ -209,14 +209,13 @@
 #define nile4_irq_shutdown nile4_disable_irq
 
 static hw_irq_controller nile4_irq_controller = {
-    "nile4",
-    nile4_irq_startup,
-    nile4_irq_shutdown,
-    nile4_enable_irq,
-    nile4_disable_irq,
-    nile4_ack_irq,
-    nile4_irq_end,
-    NULL
+	.typename = "nile4",
+	.startup = nile4_irq_startup,
+	.shutdown = nile4_irq_shutdown,
+	.enable = nile4_enable_irq,
+	.disable = nile4_disable_irq,
+	.ack = nile4_ack_irq,
+	.end = nile4_irq_end,
 };
 
 void nile4_irq_setup(u32 base) {
arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c 2.6.11-rc5/arch/mips/ddb5xxx/ddb5476/vrc5476_irq.c
@@ -53,14 +53,13 @@
 }
 
 static hw_irq_controller vrc5476_irq_controller = {
-	"vrc5476",
-	vrc5476_irq_startup,
-	vrc5476_irq_shutdown,
-	vrc5476_irq_enable,
-	vrc5476_irq_disable,
-	vrc5476_irq_ack,
-	vrc5476_irq_end,
-	NULL				/* no affinity stuff for UP */
+	.typename = "vrc5476",
+	.startup = vrc5476_irq_startup,
+	.shutdown = vrc5476_irq_shutdown,
+	.enable = vrc5476_irq_enable,
+	.disable = vrc5476_irq_disable,
+	.ack = vrc5476_irq_ack,
+	.end = vrc5476_irq_end
 };
 
 void __init
arch/mips/ddb5xxx/ddb5477/irq_5477.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/ddb5xxx/ddb5477/irq_5477.c 2.6.11-rc5/arch/mips/ddb5xxx/ddb5477/irq_5477.c
@@ -90,14 +90,13 @@
 }
 
 hw_irq_controller vrc5477_irq_controller = {
-	"vrc5477_irq",
-	vrc5477_irq_startup,
-	vrc5477_irq_shutdown,
-	vrc5477_irq_enable,
-	vrc5477_irq_disable,
-	vrc5477_irq_ack,
-	vrc5477_irq_end,
-	NULL			/* no affinity stuff for UP */
+	.typename = "vrc5477_irq",
+	.startup = vrc5477_irq_startup,
+	.shutdown = vrc5477_irq_shutdown,
+	.enable = vrc5477_irq_enable,
+	.disable = vrc5477_irq_disable,
+	.ack = vrc5477_irq_ack,
+	.end = vrc5477_irq_end
 };
 
 void __init vrc5477_irq_init(u32 irq_base)
arch/mips/ite-boards/generic/irq.c +14 -15
diff -urN 2.6.11-rc5.orig/arch/mips/ite-boards/generic/irq.c 2.6.11-rc5/arch/mips/ite-boards/generic/irq.c
@@ -138,14 +138,13 @@
 }
 
 static struct hw_interrupt_type it8172_irq_type = {
-	"ITE8172",
-	startup_ite_irq,
-	shutdown_ite_irq,
-	enable_it8172_irq,
-	disable_it8172_irq,
-	mask_and_ack_ite_irq,
-	end_ite_irq,
-	NULL
+	.typename = "ITE8172",
+	.startup = startup_ite_irq,
+	.shutdown = shutdown_ite_irq,
+	.enable = enable_it8172_irq,
+	.disable = disable_it8172_irq,
+	.ack = mask_and_ack_ite_irq,
+	.end = end_ite_irq,
 };
 
 

@@ -159,13 +158,13 @@
 #define end_none	enable_none
 
 static struct hw_interrupt_type cp0_irq_type = {
-	"CP0 Count",
-	startup_none,
-	shutdown_none,
-	enable_none,
-	disable_none,
-	ack_none,
-	end_none
+	.typename = "CP0 Count",
+	.startup = startup_none,
+	.shutdown = shutdown_none,
+	.enable = enable_none,
+	.disable = disable_none,
+	.ack = ack_none,
+	.end = end_none
 };
 
 void enable_cpu_timer(void)
arch/mips/jazz/irq.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/jazz/irq.c 2.6.11-rc5/arch/mips/jazz/irq.c
@@ -58,14 +58,13 @@
 }
 
 static struct hw_interrupt_type r4030_irq_type = {
-	"R4030",
-	startup_r4030_irq,
-	shutdown_r4030_irq,
-	enable_r4030_irq,
-	disable_r4030_irq,
-	mask_and_ack_r4030_irq,
-	end_r4030_irq,
-	NULL
+	.typename = "R4030",
+	.startup = startup_r4030_irq,
+	.shutdown = shutdown_r4030_irq,
+	.enable = enable_r4030_irq,
+	.disable = disable_r4030_irq,
+	.ack = mask_and_ack_r4030_irq,
+	.end = end_r4030_irq,
 };
 
 void __init init_r4030_ints(void)
arch/mips/jmr3927/rbhma3100/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/mips/jmr3927/rbhma3100/irq.c 2.6.11-rc5/arch/mips/jmr3927/rbhma3100/irq.c
@@ -412,13 +412,13 @@
 }
 
 static hw_irq_controller jmr3927_irq_controller = {
-	"jmr3927_irq",
-	jmr3927_irq_startup,
-	jmr3927_irq_shutdown,
-	jmr3927_irq_enable,
-	jmr3927_irq_disable,
-	jmr3927_irq_ack,
-	jmr3927_irq_end,
+	.typename = "jmr3927_irq",
+	.startup = jmr3927_irq_startup,
+	.shutdown = jmr3927_irq_shutdown,
+	.enable = jmr3927_irq_enable,
+	.disable = jmr3927_irq_disable,
+	.ack = jmr3927_irq_ack,
+	.end = jmr3927_irq_end,
 };
 
 void jmr3927_irq_init(u32 irq_base)
arch/mips/kernel/i8259.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/kernel/i8259.c 2.6.11-rc5/arch/mips/kernel/i8259.c
@@ -52,14 +52,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,
 };
 
 /*
arch/mips/kernel/irq_cpu.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/kernel/irq_cpu.c 2.6.11-rc5/arch/mips/kernel/irq_cpu.c
@@ -92,14 +92,13 @@
 }
 
 static hw_irq_controller mips_cpu_irq_controller = {
-	"MIPS",
-	mips_cpu_irq_startup,
-	mips_cpu_irq_shutdown,
-	mips_cpu_irq_enable,
-	mips_cpu_irq_disable,
-	mips_cpu_irq_ack,
-	mips_cpu_irq_end,
-	NULL			/* no affinity stuff for UP */
+	.typename = "MIPS",
+	.startup = mips_cpu_irq_startup,
+	.shutdown = mips_cpu_irq_shutdown,
+	.enable = mips_cpu_irq_enable,
+	.disable = mips_cpu_irq_disable,
+	.ack = mips_cpu_irq_ack,
+	.end = mips_cpu_irq_end,
 };
arch/mips/kernel/irq-msc01.c +14 -16
diff -urN 2.6.11-rc5.orig/arch/mips/kernel/irq-msc01.c 2.6.11-rc5/arch/mips/kernel/irq-msc01.c
@@ -129,25 +129,23 @@
 #define shutdown_msc_irq	disable_msc_irq
 
 struct hw_interrupt_type msc_levelirq_type = {
-	"SOC-it-Level",
-	startup_msc_irq,
-	shutdown_msc_irq,
-	enable_msc_irq,
-	disable_msc_irq,
-	level_mask_and_ack_msc_irq,
-	end_msc_irq,
-	NULL
+	.typename = "SOC-it-Level",
+	.startup = startup_msc_irq,
+	.shutdown = shutdown_msc_irq,
+	.enable = enable_msc_irq,
+	.disable = disable_msc_irq,
+	.ack = level_mask_and_ack_msc_irq,
+	.end = end_msc_irq,
 };
 
 struct hw_interrupt_type msc_edgeirq_type = {
-	"SOC-it-Edge",
-	startup_msc_irq,
-	shutdown_msc_irq,
-	enable_msc_irq,
-	disable_msc_irq,
-	edge_mask_and_ack_msc_irq,
-	end_msc_irq,
-	NULL
+	.typename = "SOC-it-Edge",
+	.startup =startup_msc_irq,
+	.shutdown = shutdown_msc_irq,
+	.enable = enable_msc_irq,
+	.disable = disable_msc_irq,
+	.ack = edge_mask_and_ack_msc_irq,
+	.end = end_msc_irq,
 };
arch/mips/kernel/irq-mv6434x.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/kernel/irq-mv6434x.c 2.6.11-rc5/arch/mips/kernel/irq-mv6434x.c
@@ -135,14 +135,13 @@
 #define shutdown_mv64340_irq	disable_mv64340_irq
 
 struct hw_interrupt_type mv64340_irq_type = {
-	"MV-64340",
-	startup_mv64340_irq,
-	shutdown_mv64340_irq,
-	enable_mv64340_irq,
-	disable_mv64340_irq,
-	mask_and_ack_mv64340_irq,
-	end_mv64340_irq,
-	NULL
+	.typename = "MV-64340",
+	.startup = startup_mv64340_irq,
+	.shutdown = shutdown_mv64340_irq,
+	.enable = enable_mv64340_irq,
+	.disable = disable_mv64340_irq,
+	.ack = mask_and_ack_mv64340_irq,
+	.end = end_mv64340_irq,
 };
 
 void __init mv64340_irq_init(unsigned int base)
arch/mips/kernel/irq-rm7000.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/mips/kernel/irq-rm7000.c 2.6.11-rc5/arch/mips/kernel/irq-rm7000.c
@@ -72,13 +72,13 @@
 }
 
 static hw_irq_controller rm7k_irq_controller = {
-	"RM7000",
-	rm7k_cpu_irq_startup,
-	rm7k_cpu_irq_shutdown,
-	rm7k_cpu_irq_enable,
-	rm7k_cpu_irq_disable,
-	rm7k_cpu_irq_ack,
-	rm7k_cpu_irq_end,
+	.typename = "RM7000",
+	.startup = rm7k_cpu_irq_startup,
+	.shutdown = rm7k_cpu_irq_shutdown,
+	.enable = rm7k_cpu_irq_enable,
+	.disable = rm7k_cpu_irq_disable,
+	.ack = rm7k_cpu_irq_ack,
+	.end = rm7k_cpu_irq_end,
 };
 
 void __init rm7k_cpu_irq_init(int base)
arch/mips/kernel/irq-rm9000.c +14 -14
diff -urN 2.6.11-rc5.orig/arch/mips/kernel/irq-rm9000.c 2.6.11-rc5/arch/mips/kernel/irq-rm9000.c
@@ -106,23 +106,23 @@
 }
 
 static hw_irq_controller rm9k_irq_controller = {
-	"RM9000",
-	rm9k_cpu_irq_startup,
-	rm9k_cpu_irq_shutdown,
-	rm9k_cpu_irq_enable,
-	rm9k_cpu_irq_disable,
-	rm9k_cpu_irq_ack,
-	rm9k_cpu_irq_end,
+	.typename = "RM9000",
+	.startup = rm9k_cpu_irq_startup,
+	.shutdown = rm9k_cpu_irq_shutdown,
+	.enable = rm9k_cpu_irq_enable,
+	.disable = rm9k_cpu_irq_disable,
+	.ack = rm9k_cpu_irq_ack,
+	.end = rm9k_cpu_irq_end,
 };
 
 static hw_irq_controller rm9k_perfcounter_irq = {
-	"RM9000",
-	rm9k_perfcounter_irq_startup,
-	rm9k_perfcounter_irq_shutdown,
-	rm9k_cpu_irq_enable,
-	rm9k_cpu_irq_disable,
-	rm9k_cpu_irq_ack,
-	rm9k_cpu_irq_end,
+	.typename = "RM9000",
+	.startup = rm9k_perfcounter_irq_startup,
+	.shutdown = rm9k_perfcounter_irq_shutdown,
+	.enable = rm9k_cpu_irq_enable,
+	.disable = rm9k_cpu_irq_disable,
+	.ack = rm9k_cpu_irq_ack,
+	.end = rm9k_cpu_irq_end,
 };
 
 unsigned int rm9000_perfcount_irq;
arch/mips/lasat/interrupt.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/lasat/interrupt.c 2.6.11-rc5/arch/mips/lasat/interrupt.c
@@ -71,14 +71,13 @@
 }
 
 static struct hw_interrupt_type lasat_irq_type = {
-	"Lasat",
-	startup_lasat_irq,
-	shutdown_lasat_irq,
-	enable_lasat_irq,
-	disable_lasat_irq,
-	mask_and_ack_lasat_irq,
-	end_lasat_irq,
-	NULL
+	.typename = "Lasat",
+	.startup = startup_lasat_irq,
+	.shutdown = shutdown_lasat_irq,
+	.enable = enable_lasat_irq,
+	.disable = disable_lasat_irq,
+	.ack = mask_and_ack_lasat_irq,
+	.end = end_lasat_irq,
 };
 
 static inline int ls1bit32(unsigned int x)
arch/mips/mips-boards/atlas/atlas_int.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/mips-boards/atlas/atlas_int.c 2.6.11-rc5/arch/mips/mips-boards/atlas/atlas_int.c
@@ -76,14 +76,13 @@
 }
 
 static struct hw_interrupt_type atlas_irq_type = {
-	"Atlas",
-	startup_atlas_irq,
-	shutdown_atlas_irq,
-	enable_atlas_irq,
-	disable_atlas_irq,
-	mask_and_ack_atlas_irq,
-	end_atlas_irq,
-	NULL
+	.typename = "Atlas",
+	.startup = startup_atlas_irq,
+	.shutdown = shutdown_atlas_irq,
+	.enable = enable_atlas_irq,
+	.disable = disable_atlas_irq,
+	.ack = mask_and_ack_atlas_irq,
+	.end = end_atlas_irq,
 };
 
 static inline int ls1bit32(unsigned int x)
arch/mips/momentum/ocelot_c/cpci-irq.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/momentum/ocelot_c/cpci-irq.c 2.6.11-rc5/arch/mips/momentum/ocelot_c/cpci-irq.c
@@ -129,14 +129,13 @@
 #define shutdown_cpci_irq	disable_cpci_irq
 
 struct hw_interrupt_type cpci_irq_type = {
-	"CPCI/FPGA",
-	startup_cpci_irq,
-	shutdown_cpci_irq,
-	enable_cpci_irq,
-	disable_cpci_irq,
-	mask_and_ack_cpci_irq,
-	end_cpci_irq,
-	NULL
+	.typename = "CPCI/FPGA",
+	.startup = startup_cpci_irq,
+	.shutdown = shutdown_cpci_irq,
+	.enable = enable_cpci_irq,
+	.disable = disable_cpci_irq,
+	.ack = mask_and_ack_cpci_irq,
+	.end = end_cpci_irq,
 };
 
 void cpci_irq_init(void)
arch/mips/momentum/ocelot_c/uart-irq.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/momentum/ocelot_c/uart-irq.c 2.6.11-rc5/arch/mips/momentum/ocelot_c/uart-irq.c
@@ -122,14 +122,13 @@
 #define shutdown_uart_irq	disable_uart_irq
 
 struct hw_interrupt_type uart_irq_type = {
-	"UART/FPGA",
-	startup_uart_irq,
-	shutdown_uart_irq,
-	enable_uart_irq,
-	disable_uart_irq,
-	mask_and_ack_uart_irq,
-	end_uart_irq,
-	NULL
+	.typename = "UART/FPGA",
+	.startup = startup_uart_irq,
+	.shutdown = shutdown_uart_irq,
+	.enable = enable_uart_irq,
+	.disable = disable_uart_irq,
+	.ack = mask_and_ack_uart_irq,
+	.end = end_uart_irq,
 };
 
 void uart_irq_init(void)
arch/mips/sgi-ip32/ip32-irq.c +35 -40

105 lines not on this page · raw message

arch/mips/sibyte/sb1250/irq.c +8 -10
diff -urN 2.6.11-rc5.orig/arch/mips/sibyte/sb1250/irq.c 2.6.11-rc5/arch/mips/sibyte/sb1250/irq.c
@@ -71,17 +71,15 @@
 #endif
 
 static struct hw_interrupt_type sb1250_irq_type = {
-	"SB1250-IMR",
-	startup_sb1250_irq,
-	shutdown_sb1250_irq,
-	enable_sb1250_irq,
-	disable_sb1250_irq,
-	ack_sb1250_irq,
-	end_sb1250_irq,
+	.typename = "SB1250-IMR",
+	.startup = startup_sb1250_irq,
+	.shutdown = shutdown_sb1250_irq,
+	.enable = enable_sb1250_irq,
+	.disable = disable_sb1250_irq,
+	.ack = ack_sb1250_irq,
+	.end = end_sb1250_irq,
 #ifdef CONFIG_SMP
-	sb1250_set_affinity
-#else
-	NULL
+	.set_affinity = sb1250_set_affinity
 #endif
 };
arch/mips/sni/irq.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/mips/sni/irq.c 2.6.11-rc5/arch/mips/sni/irq.c
@@ -58,14 +58,13 @@
 }
 
 static struct hw_interrupt_type pciasic_irq_type = {
-	"ASIC-PCI",
-	startup_pciasic_irq,
-	shutdown_pciasic_irq,
-	enable_pciasic_irq,
-	disable_pciasic_irq,
-	mask_and_ack_pciasic_irq,
-	end_pciasic_irq,
-	NULL
+	.typename = "ASIC-PCI",
+	.startup = startup_pciasic_irq,
+	.shutdown = shutdown_pciasic_irq,
+	.enable = enable_pciasic_irq,
+	.disable = disable_pciasic_irq,
+	.ack = mask_and_ack_pciasic_irq,
+	.end = end_pciasic_irq,
 };
 
 /*
arch/mips/vr4181/common/irq.c +14 -16
diff -urN 2.6.11-rc5.orig/arch/mips/vr4181/common/irq.c 2.6.11-rc5/arch/mips/vr4181/common/irq.c
@@ -86,14 +86,13 @@
 }
 
 static hw_irq_controller sys_irq_controller = {
-	"vr4181_sys_irq",
-	sys_irq_startup,
-	sys_irq_shutdown,
-	sys_irq_enable,
-	sys_irq_disable,
-	sys_irq_ack,
-	sys_irq_end,
-	NULL			/* no affinity stuff for UP */
+	.typename = "vr4181_sys_irq",
+	.startup = sys_irq_startup,
+	.shutdown = sys_irq_shutdown,
+	.enable = sys_irq_enable,
+	.disable = sys_irq_disable,
+	.ack = sys_irq_ack,
+	.end = sys_irq_end,
 };
 
 /* ---------------------- gpio irq ------------------------ */

@@ -162,14 +161,13 @@
 }
 
 static hw_irq_controller gpio_irq_controller = {
-	"vr4181_gpio_irq",
-	gpio_irq_startup,
-	gpio_irq_shutdown,
-	gpio_irq_enable,
-	gpio_irq_disable,
-	gpio_irq_ack,
-	gpio_irq_end,
-	NULL			/* no affinity stuff for UP */
+	.typename = "vr4181_gpio_irq",
+	.startup = gpio_irq_startup,
+	.shutdown = gpio_irq_shutdown,
+	.enable = gpio_irq_enable,
+	.disable = gpio_irq_disable,
+	.ack = gpio_irq_ack,
+	.end = gpio_irq_end,
 };
 
 /* ---------------------  IRQ init stuff ---------------------- */
author
#6 lore raw

PATCH 6/10 V850: C99 initializers for hw_interrupt_type structures

In reply to [email protected]

Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by Thomas Gleixner <[email protected]>
---
 irq.c   |   14 +++++++-------
 setup.c |   14 +++++++-------
 sim.c   |   14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

---

arch/v850/kernel/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/v850/kernel/irq.c 2.6.11-rc5/arch/v850/kernel/irq.c
@@ -67,13 +67,13 @@
 #define end_none	enable_none
 
 struct hw_interrupt_type no_irq_type = {
-	"none",
-	startup_none,
-	shutdown_none,
-	enable_none,
-	disable_none,
-	ack_none,
-	end_none
+	.typename = "none",
+	.startup = startup_none,
+	.shutdown = shutdown_none,
+	.enable = enable_none,
+	.disable = disable_none,
+	.ack = ack_none,
+	.end = end_none
 };
 
 volatile unsigned long irq_err_count, spurious_count;
arch/v850/kernel/setup.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/v850/kernel/setup.c 2.6.11-rc5/arch/v850/kernel/setup.c
@@ -128,13 +128,13 @@
 }
 
 static struct hw_interrupt_type nmi_irq_type = {
-	"NMI",
-	irq_zero,		/* startup */
-	irq_nop,		/* shutdown */
-	irq_nop,		/* enable */
-	irq_nop,		/* disable */
-	irq_nop,		/* ack */
-	nmi_end,		/* end */
+	.typename = "NMI",
+	.startup = irq_zero,		/* startup */
+	.shutdown = irq_nop,		/* shutdown */
+	.enable = irq_nop,		/* enable */
+	.disable = irq_nop,		/* disable */
+	.ack = irq_nop,		/* ack */
+	.end = nmi_end,		/* end */
 };
 
 void __init init_IRQ (void)
arch/v850/kernel/sim.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/v850/kernel/sim.c 2.6.11-rc5/arch/v850/kernel/sim.c
@@ -73,13 +73,13 @@
 static unsigned irq_zero (unsigned irq) { return 0; }
 
 static struct hw_interrupt_type sim_irq_type = {
-	"IRQ",
-	irq_zero,		/* startup */
-	irq_nop,		/* shutdown */
-	irq_nop,		/* enable */
-	irq_nop,		/* disable */
-	irq_nop,		/* ack */
-	irq_nop,		/* end */
+	.typename = "IRQ",
+	.startup = irq_zero,		/* startup */
+	.shutdown = irq_nop,		/* shutdown */
+	.enable = irq_nop,		/* enable */
+	.disable = irq_nop,		/* disable */
+	.ack = irq_nop,		/* ack */
+	.end = irq_nop,		/* end */
 };
 
 void __init mach_init_irqs (void)
author
#7 lore raw

PATCH 7/10 I386: C99 initializers for hw_interrupt_type structures

In reply to [email protected]

Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by Thomas Gleixner <[email protected]>
---
 kernel/i8259.c             |   15 +++++++--------
 mach-voyager/voyager_smp.c |   16 ++++++++--------
 2 files changed, 15 insertions(+), 16 deletions(-)

---

arch/i386/kernel/i8259.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/i386/kernel/i8259.c 2.6.11-rc5/arch/i386/kernel/i8259.c
@@ -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,
 };
 
 /*
arch/i386/mach-voyager/voyager_smp.c +8 -8
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
@@ -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) */
author
#8 lore raw

PATCH 8/10 SH64: C99 initializers for hw_interrupt_type structures

In reply to [email protected]

Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by Thomas Gleixner <[email protected]>
---
 irq.c      |   14 +++++++-------
 irq_intc.c |   14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

---

arch/sh64/kernel/irq.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh64/kernel/irq.c 2.6.11-rc5/arch/sh64/kernel/irq.c
@@ -81,13 +81,13 @@
 #define end_none	enable_none
 
 struct hw_interrupt_type no_irq_type = {
-	"none",
-	startup_none,
-	shutdown_none,
-	enable_none,
-	disable_none,
-	ack_none,
-	end_none
+	.typename= "none",
+	.startup = startup_none,
+	.shutdown = shutdown_none,
+	.enable = enable_none,
+	.disable = disable_none,
+	.ack = ack_none,
+	.end = end_none
 };
 
 #if defined(CONFIG_PROC_FS)
arch/sh64/kernel/irq_intc.c +7 -7
diff -urN 2.6.11-rc5.orig/arch/sh64/kernel/irq_intc.c 2.6.11-rc5/arch/sh64/kernel/irq_intc.c
@@ -107,13 +107,13 @@
 static void end_intc_irq(unsigned int irq);
 
 static struct hw_interrupt_type intc_irq_type = {
-	"INTC",
-	startup_intc_irq,
-	shutdown_intc_irq,
-	enable_intc_irq,
-	disable_intc_irq,
-	mask_and_ack_intc,
-	end_intc_irq
+	.typename = "INTC",
+	.startup = startup_intc_irq,
+	.shutdown = shutdown_intc_irq,
+	.enable = enable_intc_irq,
+	.disable = disable_intc_irq,
+	.ack = mask_and_ack_intc,
+	.end = end_intc_irq
 };
 
 static int irlm;		/* IRL mode */
author
#9 lore raw

PATCH 9/10 X86_64: C99 initializers for hw_interrupt_type structures

In reply to [email protected]

Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by Thomas Gleixner <[email protected]>
---
 i8259.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

---

arch/x86_64/kernel/i8259.c +7 -8
diff -urN 2.6.11-rc5.orig/arch/x86_64/kernel/i8259.c 2.6.11-rc5/arch/x86_64/kernel/i8259.c
@@ -157,14 +157,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,
 };
 
 /*
author
#10 lore raw

PATCH 10/10 IA64: C99 initializers for hw_interrupt_type structures

In reply to [email protected]

Convert the initializers of hw_interrupt_type structures to C99 initializers.

Signed-off-by Thomas Gleixner <[email protected]>
---
 irq.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

---

arch/ia64/sn/kernel/irq.c +8 -8
diff -urN 2.6.11-rc5.orig/arch/ia64/sn/kernel/irq.c 2.6.11-rc5/arch/ia64/sn/kernel/irq.c
@@ -194,14 +194,14 @@
 }
 
 struct hw_interrupt_type irq_type_sn = {
-	"SN hub",
-	sn_startup_irq,
-	sn_shutdown_irq,
-	sn_enable_irq,
-	sn_disable_irq,
-	sn_ack_irq,
-	sn_end_irq,
-	sn_set_affinity_irq
+	.typename = "SN hub",
+	.startup = sn_startup_irq,
+	.shutdown = sn_shutdown_irq,
+	.enable = sn_enable_irq,
+	.disable = sn_disable_irq,
+	.ack = sn_ack_irq,
+	.end = sn_end_irq,
+	.set_affinity = sn_set_affinity_irq
 };
 
 unsigned int sn_local_vector_to_irq(u8 vector)
Acked-by on v1 10/10
#11 lore raw

Re: [PATCH 10/10] IA64: C99 initializers for hw_interrupt_type structures

Quoted 19 lines

struct hw_interrupt_type irq_type_sn = {
- "SN hub",
- sn_startup_irq,
- sn_shutdown_irq,
- sn_enable_irq,
- sn_disable_irq,
- sn_ack_irq,
- sn_end_irq,
- sn_set_affinity_irq
+ .typename = "SN hub",
+ .startup = sn_startup_irq,
+ .shutdown = sn_shutdown_irq,
+ .enable = sn_enable_irq,
+ .disable = sn_disable_irq,
+ .ack = sn_ack_irq,
+ .end = sn_end_irq,
+ .set_affinity = sn_set_affinity_irq
};

Quoted 1 line

unsigned int sn_local_vector_to_irq(u8 vector)

Looks fine.

Acked-by Jesse Barnes <[email protected]>