[PATCH] m32r: Update setup_xxxxx.c

Change coding styles of hw_interrupt_type struct's initialization portions.

Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/kernel/setup_m32700ut.c
index 488aa87bab7666eeae74c6297ebcb73e0315ce4a..b014e2c1e524973a58f8adf7ecff122966446787 100644 (file)
--- a/arch/m32r/kernel/setup_m32700ut.c
+++ b/arch/m32r/kernel/setup_m32700ut.c
@@ -78,13 +78,13 @@ static void shutdown_m32700ut_irq(unsigned int irq)
 
 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 void shutdown_m32700ut_pld_irq(unsigned int irq)
 
 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 void shutdown_m32700ut_lanpld_irq(unsigned int irq)
 
 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 void shutdown_m32700ut_lcdpld_irq(unsigned int irq)
 
 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)

diff --git a/arch/m32r/kernel/setup_mappi.c b/arch/m32r/kernel/setup_mappi.c
index 1e74110f0670a19008d8632482f353c815b4f98d..aaf8e569b930267a45b4603fc351d58daae9f11e 100644 (file)
--- a/arch/m32r/kernel/setup_mappi.c
+++ b/arch/m32r/kernel/setup_mappi.c
@@ -70,13 +70,13 @@ static void shutdown_mappi_irq(unsigned int irq)
 
 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)

diff --git a/arch/m32r/kernel/setup_mappi2.c b/arch/m32r/kernel/setup_mappi2.c
index 248fc658dbd5249f3cf06c2e44cea508d8f40b41..38d5e9a4142782ac201748ea4c3a0b52fae2865d 100644 (file)
--- a/arch/m32r/kernel/setup_mappi2.c
+++ b/arch/m32r/kernel/setup_mappi2.c
@@ -79,13 +79,13 @@ static void shutdown_mappi2_irq(unsigned int irq)
 
 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)

diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/kernel/setup_mappi3.c
index 72b5b7609cea346bbb4a5df5f52a57bb70cf582c..3d60a85aaec5209cf56c42bb1ef0911506caa9c1 100644 (file)
--- a/arch/m32r/kernel/setup_mappi3.c
+++ b/arch/m32r/kernel/setup_mappi3.c
@@ -79,13 +79,13 @@ static void shutdown_mappi3_irq(unsigned int irq)
 
 static struct hw_interrupt_type mappi3_irq_type =
 {
-       "MAPPI3-IRQ",
-       startup_mappi3_irq,
-       shutdown_mappi3_irq,
-       enable_mappi3_irq,
-       disable_mappi3_irq,
-       mask_and_ack_mappi3,
-       end_mappi3_irq
+       .typename = "MAPPI3-IRQ",
+       .startup = startup_mappi3_irq,
+       .shutdown = shutdown_mappi3_irq,
+       .enable = enable_mappi3_irq,
+       .disable = disable_mappi3_irq,
+       .ack = mask_and_ack_mappi3,
+       .end = end_mappi3_irq
 };
 
 void __init init_IRQ(void)

diff --git a/arch/m32r/kernel/setup_oaks32r.c b/arch/m32r/kernel/setup_oaks32r.c
index b04834526c9a8a6311ace7897b13bc90487360d7..d656640badc98f091bedb9b29004903fb445cb9d 100644 (file)
--- a/arch/m32r/kernel/setup_oaks32r.c
+++ b/arch/m32r/kernel/setup_oaks32r.c
@@ -70,13 +70,13 @@ static void shutdown_oaks32r_irq(unsigned int irq)
 
 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)

diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/kernel/setup_opsput.c
index 84315e344c58007e6e2e1ec155b06b0b5256f35e..86f4cf2a86c3ba6b4eb25c81aad7983aea924e0f 100644 (file)
--- a/arch/m32r/kernel/setup_opsput.c
+++ b/arch/m32r/kernel/setup_opsput.c
@@ -79,13 +79,13 @@ static void shutdown_opsput_irq(unsigned int irq)
 
 static struct hw_interrupt_type opsput_irq_type =
 {
-       "OPSPUT-IRQ",
-       startup_opsput_irq,
-       shutdown_opsput_irq,
-       enable_opsput_irq,
-       disable_opsput_irq,
-       mask_and_ack_opsput,
-       end_opsput_irq
+       .typename = "OPSPUT-IRQ",
+       .startup = startup_opsput_irq,
+       .shutdown = shutdown_opsput_irq,
+       .enable = enable_opsput_irq,
+       .disable = disable_opsput_irq,
+       .ack = mask_and_ack_opsput,
+       .end = end_opsput_irq
 };
 
 /*
@@ -156,13 +156,13 @@ static void shutdown_opsput_pld_irq(unsigned int irq)
 
 static struct hw_interrupt_type opsput_pld_irq_type =
 {
-       "OPSPUT-PLD-IRQ",
-       startup_opsput_pld_irq,
-       shutdown_opsput_pld_irq,
-       enable_opsput_pld_irq,
-       disable_opsput_pld_irq,
-       mask_and_ack_opsput_pld,
-       end_opsput_pld_irq
+       .typename = "OPSPUT-PLD-IRQ",
+       .startup = startup_opsput_pld_irq,
+       .shutdown = shutdown_opsput_pld_irq,
+       .enable = enable_opsput_pld_irq,
+       .disable = disable_opsput_pld_irq,
+       .ack = mask_and_ack_opsput_pld,
+       .end = end_opsput_pld_irq
 };
 
 /*

diff --git a/arch/m32r/kernel/setup_usrv.c b/arch/m32r/kernel/setup_usrv.c
index fe417be5e3e95c5e4ec8c9958761e3847282b3ac..634741bf9d355c736463b4cb0df4ab4245449485 100644 (file)
--- a/arch/m32r/kernel/setup_usrv.c
+++ b/arch/m32r/kernel/setup_usrv.c
@@ -70,13 +70,13 @@ static void shutdown_mappi_irq(unsigned int irq)
 
 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 void shutdown_m32700ut_pld_irq(unsigned int irq)
 
 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)