diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-03 02:04:08 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-10-03 02:04:08 -0400 |
commit | e1fb4552ac938f2f70e9df2169b681594752bd85 (patch) | |
tree | 5a2829639e8a27a8a664299bf0c5d66bce4327f3 /arch | |
parent | 008d50fc16e8ea5005d324a25d62d29e417151fe (diff) |
sh: cleanup struct irqaction initializers.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/boards/se/7343/irq.c | 7 | ||||
-rw-r--r-- | arch/sh/cchips/hd6446x/hd64461.c | 7 | ||||
-rw-r--r-- | arch/sh/cchips/hd6446x/hd64465/setup.c | 7 |
3 files changed, 17 insertions, 4 deletions
diff --git a/arch/sh/boards/se/7343/irq.c b/arch/sh/boards/se/7343/irq.c index 360153ecc55b..763f6deba814 100644 --- a/arch/sh/boards/se/7343/irq.c +++ b/arch/sh/boards/se/7343/irq.c | |||
@@ -99,8 +99,11 @@ shmse_irq_demux(int irq) | |||
99 | * | 99 | * |
100 | * We configure IRQ5 as a cascade IRQ. | 100 | * We configure IRQ5 as a cascade IRQ. |
101 | */ | 101 | */ |
102 | static struct irqaction irq5 = { no_action, 0, CPU_MASK_NONE, "IRQ5-cascade", | 102 | static struct irqaction irq5 = { |
103 | NULL, NULL}; | 103 | .handler = no_action, |
104 | .mask = CPU_MASK_NONE, | ||
105 | .name = "IRQ5-cascade", | ||
106 | }; | ||
104 | 107 | ||
105 | static struct ipr_data se7343_irq5_ipr_map[] = { | 108 | static struct ipr_data se7343_irq5_ipr_map[] = { |
106 | { IRQ5_IRQ, IRQ5_IPR_ADDR+2, IRQ5_IPR_POS, IRQ5_PRIORITY }, | 109 | { IRQ5_IRQ, IRQ5_IPR_ADDR+2, IRQ5_IPR_POS, IRQ5_PRIORITY }, |
diff --git a/arch/sh/cchips/hd6446x/hd64461.c b/arch/sh/cchips/hd6446x/hd64461.c index b77754d9697a..f1a4a0763c59 100644 --- a/arch/sh/cchips/hd6446x/hd64461.c +++ b/arch/sh/cchips/hd6446x/hd64461.c | |||
@@ -127,7 +127,12 @@ int hd64461_irq_demux(int irq) | |||
127 | return irq; | 127 | return irq; |
128 | } | 128 | } |
129 | 129 | ||
130 | static struct irqaction irq0 = { hd64461_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64461", NULL, NULL }; | 130 | static struct irqaction irq0 = { |
131 | .handler = hd64461_interrupt, | ||
132 | .flags = IRQF_DISABLED, | ||
133 | .mask = CPU_MASK_NONE, | ||
134 | .name = "HD64461", | ||
135 | }; | ||
131 | 136 | ||
132 | int __init setup_hd64461(void) | 137 | int __init setup_hd64461(void) |
133 | { | 138 | { |
diff --git a/arch/sh/cchips/hd6446x/hd64465/setup.c b/arch/sh/cchips/hd6446x/hd64465/setup.c index d126e1f30dee..5cef0db4018b 100644 --- a/arch/sh/cchips/hd6446x/hd64465/setup.c +++ b/arch/sh/cchips/hd6446x/hd64465/setup.c | |||
@@ -147,7 +147,12 @@ int hd64465_irq_demux(int irq) | |||
147 | return irq; | 147 | return irq; |
148 | } | 148 | } |
149 | 149 | ||
150 | static struct irqaction irq0 = { hd64465_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64465", NULL, NULL}; | 150 | static struct irqaction irq0 = { |
151 | .handler = hd64465_interrupt, | ||
152 | .flags = IRQF_DISABLED, | ||
153 | .mask = CPU_MASK_NONE, | ||
154 | .name = "HD64465", | ||
155 | }; | ||
151 | 156 | ||
152 | 157 | ||
153 | static int __init setup_hd64465(void) | 158 | static int __init setup_hd64465(void) |