diff options
-rw-r--r-- | arch/sh/boards/adx/irq_maskreg.c | 14 | ||||
-rw-r--r-- | arch/sh/boards/bigsur/irq.c | 28 | ||||
-rw-r--r-- | arch/sh/boards/cqreek/irq.c | 14 | ||||
-rw-r--r-- | arch/sh/boards/harp/irq.c | 14 | ||||
-rw-r--r-- | arch/sh/boards/overdrive/irq.c | 14 | ||||
-rw-r--r-- | arch/sh/boards/renesas/hs7751rvoip/irq.c | 14 | ||||
-rw-r--r-- | arch/sh/boards/renesas/rts7751r2d/irq.c | 14 | ||||
-rw-r--r-- | arch/sh/boards/renesas/systemh/irq.c | 14 | ||||
-rw-r--r-- | arch/sh/boards/superh/microdev/irq.c | 14 | ||||
-rw-r--r-- | arch/sh/cchips/voyagergx/irq.c | 14 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/irq_imask.c | 14 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/irq_ipr.c | 28 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/irq_intc2.c | 14 |
13 files changed, 105 insertions, 105 deletions
diff --git a/arch/sh/boards/adx/irq_maskreg.c b/arch/sh/boards/adx/irq_maskreg.c index ca91bb0f1f5c..c0973f8d57ba 100644 --- a/arch/sh/boards/adx/irq_maskreg.c +++ b/arch/sh/boards/adx/irq_maskreg.c | |||
@@ -37,13 +37,13 @@ static void end_maskreg_irq(unsigned int irq); | |||
37 | 37 | ||
38 | /* hw_interrupt_type */ | 38 | /* hw_interrupt_type */ |
39 | static struct hw_interrupt_type maskreg_irq_type = { | 39 | static struct hw_interrupt_type maskreg_irq_type = { |
40 | " Mask Register", | 40 | .typename = " Mask Register", |
41 | startup_maskreg_irq, | 41 | .startup = startup_maskreg_irq, |
42 | shutdown_maskreg_irq, | 42 | .shutdown = shutdown_maskreg_irq, |
43 | enable_maskreg_irq, | 43 | .enable = enable_maskreg_irq, |
44 | disable_maskreg_irq, | 44 | .disable = disable_maskreg_irq, |
45 | mask_and_ack_maskreg, | 45 | .ack = mask_and_ack_maskreg, |
46 | end_maskreg_irq | 46 | .end = end_maskreg_irq |
47 | }; | 47 | }; |
48 | 48 | ||
49 | /* actual implementatin */ | 49 | /* actual implementatin */ |
diff --git a/arch/sh/boards/bigsur/irq.c b/arch/sh/boards/bigsur/irq.c index c188fc32dc9a..6ddbcc77244d 100644 --- a/arch/sh/boards/bigsur/irq.c +++ b/arch/sh/boards/bigsur/irq.c | |||
@@ -228,23 +228,23 @@ static void shutdown_bigsur_irq(unsigned int irq) | |||
228 | 228 | ||
229 | /* Define the IRQ structures for the L1 and L2 IRQ types */ | 229 | /* Define the IRQ structures for the L1 and L2 IRQ types */ |
230 | static struct hw_interrupt_type bigsur_l1irq_type = { | 230 | static struct hw_interrupt_type bigsur_l1irq_type = { |
231 | "BigSur-CPLD-Level1-IRQ", | 231 | .typename = "BigSur-CPLD-Level1-IRQ", |
232 | startup_bigsur_irq, | 232 | .startup = startup_bigsur_irq, |
233 | shutdown_bigsur_irq, | 233 | .shutdown = shutdown_bigsur_irq, |
234 | enable_bigsur_l1irq, | 234 | .enable = enable_bigsur_l1irq, |
235 | disable_bigsur_l1irq, | 235 | .disable = disable_bigsur_l1irq, |
236 | mask_and_ack_bigsur, | 236 | .ack = mask_and_ack_bigsur, |
237 | end_bigsur_irq | 237 | .end = end_bigsur_irq |
238 | }; | 238 | }; |
239 | 239 | ||
240 | static struct hw_interrupt_type bigsur_l2irq_type = { | 240 | static struct hw_interrupt_type bigsur_l2irq_type = { |
241 | "BigSur-CPLD-Level2-IRQ", | 241 | .typename = "BigSur-CPLD-Level2-IRQ", |
242 | startup_bigsur_irq, | 242 | .startup = startup_bigsur_irq, |
243 | shutdown_bigsur_irq, | 243 | .shutdown =shutdown_bigsur_irq, |
244 | enable_bigsur_l2irq, | 244 | .enable = enable_bigsur_l2irq, |
245 | disable_bigsur_l2irq, | 245 | .disable = disable_bigsur_l2irq, |
246 | mask_and_ack_bigsur, | 246 | .ack = mask_and_ack_bigsur, |
247 | end_bigsur_irq | 247 | .end = end_bigsur_irq |
248 | }; | 248 | }; |
249 | 249 | ||
250 | 250 | ||
diff --git a/arch/sh/boards/cqreek/irq.c b/arch/sh/boards/cqreek/irq.c index fa6cfe5a20a7..d1da0d844567 100644 --- a/arch/sh/boards/cqreek/irq.c +++ b/arch/sh/boards/cqreek/irq.c | |||
@@ -83,13 +83,13 @@ static void shutdown_cqreek_irq(unsigned int irq) | |||
83 | } | 83 | } |
84 | 84 | ||
85 | static struct hw_interrupt_type cqreek_irq_type = { | 85 | static struct hw_interrupt_type cqreek_irq_type = { |
86 | "CqREEK-IRQ", | 86 | .typename = "CqREEK-IRQ", |
87 | startup_cqreek_irq, | 87 | .startup = startup_cqreek_irq, |
88 | shutdown_cqreek_irq, | 88 | .shutdown = shutdown_cqreek_irq, |
89 | enable_cqreek_irq, | 89 | .enable = enable_cqreek_irq, |
90 | disable_cqreek_irq, | 90 | .disable = disable_cqreek_irq, |
91 | mask_and_ack_cqreek, | 91 | .ack = mask_and_ack_cqreek, |
92 | end_cqreek_irq | 92 | .end = end_cqreek_irq |
93 | }; | 93 | }; |
94 | 94 | ||
95 | int cqreek_has_ide, cqreek_has_isa; | 95 | int cqreek_has_ide, cqreek_has_isa; |
diff --git a/arch/sh/boards/harp/irq.c b/arch/sh/boards/harp/irq.c index acd58489970f..52d0ba39031b 100644 --- a/arch/sh/boards/harp/irq.c +++ b/arch/sh/boards/harp/irq.c | |||
@@ -39,13 +39,13 @@ static unsigned int startup_harp_irq(unsigned int irq) | |||
39 | } | 39 | } |
40 | 40 | ||
41 | static struct hw_interrupt_type harp_irq_type = { | 41 | static struct hw_interrupt_type harp_irq_type = { |
42 | "Harp-IRQ", | 42 | .typename = "Harp-IRQ", |
43 | startup_harp_irq, | 43 | .startup = startup_harp_irq, |
44 | shutdown_harp_irq, | 44 | .shutdown = shutdown_harp_irq, |
45 | enable_harp_irq, | 45 | .enable = enable_harp_irq, |
46 | disable_harp_irq, | 46 | .disable = disable_harp_irq, |
47 | mask_and_ack_harp, | 47 | .ack = mask_and_ack_harp, |
48 | end_harp_irq | 48 | .end = end_harp_irq |
49 | }; | 49 | }; |
50 | 50 | ||
51 | static void disable_harp_irq(unsigned int irq) | 51 | static void disable_harp_irq(unsigned int irq) |
diff --git a/arch/sh/boards/overdrive/irq.c b/arch/sh/boards/overdrive/irq.c index 23adc6be71e7..715e8feb3a68 100644 --- a/arch/sh/boards/overdrive/irq.c +++ b/arch/sh/boards/overdrive/irq.c | |||
@@ -86,13 +86,13 @@ static unsigned int startup_od_irq(unsigned int irq) | |||
86 | } | 86 | } |
87 | 87 | ||
88 | static struct hw_interrupt_type od_irq_type = { | 88 | static struct hw_interrupt_type od_irq_type = { |
89 | "Overdrive-IRQ", | 89 | .typename = "Overdrive-IRQ", |
90 | startup_od_irq, | 90 | .startup = startup_od_irq, |
91 | shutdown_od_irq, | 91 | .shutdown = shutdown_od_irq, |
92 | enable_od_irq, | 92 | .enable = enable_od_irq, |
93 | disable_od_irq, | 93 | .disable = disable_od_irq, |
94 | mask_and_ack_od, | 94 | .ack = mask_and_ack_od, |
95 | end_od_irq | 95 | .end = end_od_irq |
96 | }; | 96 | }; |
97 | 97 | ||
98 | static void disable_od_irq(unsigned int irq) | 98 | static void disable_od_irq(unsigned int irq) |
diff --git a/arch/sh/boards/renesas/hs7751rvoip/irq.c b/arch/sh/boards/renesas/hs7751rvoip/irq.c index a7921f67a35f..ed4c5b50ea45 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/irq.c +++ b/arch/sh/boards/renesas/hs7751rvoip/irq.c | |||
@@ -74,13 +74,13 @@ static void end_hs7751rvoip_irq(unsigned int irq) | |||
74 | } | 74 | } |
75 | 75 | ||
76 | static struct hw_interrupt_type hs7751rvoip_irq_type = { | 76 | static struct hw_interrupt_type hs7751rvoip_irq_type = { |
77 | "HS7751RVoIP IRQ", | 77 | .typename = "HS7751RVoIP IRQ", |
78 | startup_hs7751rvoip_irq, | 78 | .startup = startup_hs7751rvoip_irq, |
79 | shutdown_hs7751rvoip_irq, | 79 | .shutdown = shutdown_hs7751rvoip_irq, |
80 | enable_hs7751rvoip_irq, | 80 | .enable = enable_hs7751rvoip_irq, |
81 | disable_hs7751rvoip_irq, | 81 | .disable = disable_hs7751rvoip_irq, |
82 | ack_hs7751rvoip_irq, | 82 | .ack = ack_hs7751rvoip_irq, |
83 | end_hs7751rvoip_irq, | 83 | .end = end_hs7751rvoip_irq, |
84 | }; | 84 | }; |
85 | 85 | ||
86 | static void make_hs7751rvoip_irq(unsigned int irq) | 86 | static void make_hs7751rvoip_irq(unsigned int irq) |
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c index 95717f4f1e2d..d36c9374aed1 100644 --- a/arch/sh/boards/renesas/rts7751r2d/irq.c +++ b/arch/sh/boards/renesas/rts7751r2d/irq.c | |||
@@ -88,13 +88,13 @@ static void end_rts7751r2d_irq(unsigned int irq) | |||
88 | } | 88 | } |
89 | 89 | ||
90 | static struct hw_interrupt_type rts7751r2d_irq_type = { | 90 | static struct hw_interrupt_type rts7751r2d_irq_type = { |
91 | "RTS7751R2D IRQ", | 91 | .typename = "RTS7751R2D IRQ", |
92 | startup_rts7751r2d_irq, | 92 | .startup = startup_rts7751r2d_irq, |
93 | shutdown_rts7751r2d_irq, | 93 | .shutdown = shutdown_rts7751r2d_irq, |
94 | enable_rts7751r2d_irq, | 94 | .enable = enable_rts7751r2d_irq, |
95 | disable_rts7751r2d_irq, | 95 | .disable = disable_rts7751r2d_irq, |
96 | ack_rts7751r2d_irq, | 96 | .ack = ack_rts7751r2d_irq, |
97 | end_rts7751r2d_irq, | 97 | .end = end_rts7751r2d_irq, |
98 | }; | 98 | }; |
99 | 99 | ||
100 | static void make_rts7751r2d_irq(unsigned int irq) | 100 | static void make_rts7751r2d_irq(unsigned int irq) |
diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c index 5675a4134eee..7a2eb10edb56 100644 --- a/arch/sh/boards/renesas/systemh/irq.c +++ b/arch/sh/boards/renesas/systemh/irq.c | |||
@@ -35,13 +35,13 @@ static void end_systemh_irq(unsigned int irq); | |||
35 | 35 | ||
36 | /* hw_interrupt_type */ | 36 | /* hw_interrupt_type */ |
37 | static struct hw_interrupt_type systemh_irq_type = { | 37 | static struct hw_interrupt_type systemh_irq_type = { |
38 | " SystemH Register", | 38 | .typename = " SystemH Register", |
39 | startup_systemh_irq, | 39 | .startup = startup_systemh_irq, |
40 | shutdown_systemh_irq, | 40 | .shutdown = shutdown_systemh_irq, |
41 | enable_systemh_irq, | 41 | .enable = enable_systemh_irq, |
42 | disable_systemh_irq, | 42 | .disable = disable_systemh_irq, |
43 | mask_and_ack_systemh, | 43 | .ack = mask_and_ack_systemh, |
44 | end_systemh_irq | 44 | .end = end_systemh_irq |
45 | }; | 45 | }; |
46 | 46 | ||
47 | static unsigned int startup_systemh_irq(unsigned int irq) | 47 | static unsigned int startup_systemh_irq(unsigned int irq) |
diff --git a/arch/sh/boards/superh/microdev/irq.c b/arch/sh/boards/superh/microdev/irq.c index 1298883eca4b..1395c1e65da4 100644 --- a/arch/sh/boards/superh/microdev/irq.c +++ b/arch/sh/boards/superh/microdev/irq.c | |||
@@ -83,13 +83,13 @@ static unsigned int startup_microdev_irq(unsigned int irq) | |||
83 | } | 83 | } |
84 | 84 | ||
85 | static struct hw_interrupt_type microdev_irq_type = { | 85 | static struct hw_interrupt_type microdev_irq_type = { |
86 | "MicroDev-IRQ", | 86 | .typename = "MicroDev-IRQ", |
87 | startup_microdev_irq, | 87 | .startup = startup_microdev_irq, |
88 | shutdown_microdev_irq, | 88 | .shutdown = shutdown_microdev_irq, |
89 | enable_microdev_irq, | 89 | .enable = enable_microdev_irq, |
90 | disable_microdev_irq, | 90 | .disable = disable_microdev_irq, |
91 | mask_and_ack_microdev, | 91 | .ack = mask_and_ack_microdev, |
92 | end_microdev_irq | 92 | .end = end_microdev_irq |
93 | }; | 93 | }; |
94 | 94 | ||
95 | static void disable_microdev_irq(unsigned int irq) | 95 | static void disable_microdev_irq(unsigned int irq) |
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c index 3079234cb65b..1b6ac523b458 100644 --- a/arch/sh/cchips/voyagergx/irq.c +++ b/arch/sh/cchips/voyagergx/irq.c | |||
@@ -87,13 +87,13 @@ static void shutdown_voyagergx_irq(unsigned int irq) | |||
87 | } | 87 | } |
88 | 88 | ||
89 | static struct hw_interrupt_type voyagergx_irq_type = { | 89 | static struct hw_interrupt_type voyagergx_irq_type = { |
90 | "VOYAGERGX-IRQ", | 90 | .typename = "VOYAGERGX-IRQ", |
91 | startup_voyagergx_irq, | 91 | .startup = startup_voyagergx_irq, |
92 | shutdown_voyagergx_irq, | 92 | .shutdown = shutdown_voyagergx_irq, |
93 | enable_voyagergx_irq, | 93 | .enable = enable_voyagergx_irq, |
94 | disable_voyagergx_irq, | 94 | .disable = disable_voyagergx_irq, |
95 | mask_and_ack_voyagergx, | 95 | .ack = mask_and_ack_voyagergx, |
96 | end_voyagergx_irq, | 96 | .end = end_voyagergx_irq, |
97 | }; | 97 | }; |
98 | 98 | ||
99 | static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 99 | static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
diff --git a/arch/sh/kernel/cpu/irq_imask.c b/arch/sh/kernel/cpu/irq_imask.c index f76901e732fb..a963d00a971e 100644 --- a/arch/sh/kernel/cpu/irq_imask.c +++ b/arch/sh/kernel/cpu/irq_imask.c | |||
@@ -46,13 +46,13 @@ static unsigned int startup_imask_irq(unsigned int irq) | |||
46 | } | 46 | } |
47 | 47 | ||
48 | static struct hw_interrupt_type imask_irq_type = { | 48 | static struct hw_interrupt_type imask_irq_type = { |
49 | "SR.IMASK", | 49 | .typename = "SR.IMASK", |
50 | startup_imask_irq, | 50 | .startup = startup_imask_irq, |
51 | shutdown_imask_irq, | 51 | .shutdown = shutdown_imask_irq, |
52 | enable_imask_irq, | 52 | .enable = enable_imask_irq, |
53 | disable_imask_irq, | 53 | .disable = disable_imask_irq, |
54 | mask_and_ack_imask, | 54 | .ack = mask_and_ack_imask, |
55 | end_imask_irq | 55 | .end = end_imask_irq |
56 | }; | 56 | }; |
57 | 57 | ||
58 | void static inline set_interrupt_registers(int ip) | 58 | void static inline set_interrupt_registers(int ip) |
diff --git a/arch/sh/kernel/cpu/irq_ipr.c b/arch/sh/kernel/cpu/irq_ipr.c index 7ea3d2d030e5..71f92096132b 100644 --- a/arch/sh/kernel/cpu/irq_ipr.c +++ b/arch/sh/kernel/cpu/irq_ipr.c | |||
@@ -48,13 +48,13 @@ static unsigned int startup_ipr_irq(unsigned int irq) | |||
48 | } | 48 | } |
49 | 49 | ||
50 | static struct hw_interrupt_type ipr_irq_type = { | 50 | static struct hw_interrupt_type ipr_irq_type = { |
51 | "IPR-IRQ", | 51 | .typename = "IPR-IRQ", |
52 | startup_ipr_irq, | 52 | .startup = startup_ipr_irq, |
53 | shutdown_ipr_irq, | 53 | .shutdown = shutdown_ipr_irq, |
54 | enable_ipr_irq, | 54 | .enable = enable_ipr_irq, |
55 | disable_ipr_irq, | 55 | .disable = disable_ipr_irq, |
56 | mask_and_ack_ipr, | 56 | .ack = mask_and_ack_ipr, |
57 | end_ipr_irq | 57 | .end = end_ipr_irq |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static void disable_ipr_irq(unsigned int irq) | 60 | static void disable_ipr_irq(unsigned int irq) |
@@ -142,13 +142,13 @@ static unsigned int startup_pint_irq(unsigned int irq) | |||
142 | } | 142 | } |
143 | 143 | ||
144 | static struct hw_interrupt_type pint_irq_type = { | 144 | static struct hw_interrupt_type pint_irq_type = { |
145 | "PINT-IRQ", | 145 | .typename = "PINT-IRQ", |
146 | startup_pint_irq, | 146 | .startup = startup_pint_irq, |
147 | shutdown_pint_irq, | 147 | .shutdown = shutdown_pint_irq, |
148 | enable_pint_irq, | 148 | .enable = enable_pint_irq, |
149 | disable_pint_irq, | 149 | .disable = disable_pint_irq, |
150 | mask_and_ack_pint, | 150 | .ack = mask_and_ack_pint, |
151 | end_pint_irq | 151 | .end = end_pint_irq |
152 | }; | 152 | }; |
153 | 153 | ||
154 | static void disable_pint_irq(unsigned int irq) | 154 | static void disable_pint_irq(unsigned int irq) |
diff --git a/arch/sh/kernel/cpu/sh4/irq_intc2.c b/arch/sh/kernel/cpu/sh4/irq_intc2.c index 099ebbf89745..f6b16ba01932 100644 --- a/arch/sh/kernel/cpu/sh4/irq_intc2.c +++ b/arch/sh/kernel/cpu/sh4/irq_intc2.c | |||
@@ -48,13 +48,13 @@ static unsigned int startup_intc2_irq(unsigned int irq) | |||
48 | } | 48 | } |
49 | 49 | ||
50 | static struct hw_interrupt_type intc2_irq_type = { | 50 | static struct hw_interrupt_type intc2_irq_type = { |
51 | "INTC2-IRQ", | 51 | .typename = "INTC2-IRQ", |
52 | startup_intc2_irq, | 52 | .startup = startup_intc2_irq, |
53 | shutdown_intc2_irq, | 53 | .shutdown = shutdown_intc2_irq, |
54 | enable_intc2_irq, | 54 | .enable = enable_intc2_irq, |
55 | disable_intc2_irq, | 55 | .disable = disable_intc2_irq, |
56 | mask_and_ack_intc2, | 56 | .ack = mask_and_ack_intc2, |
57 | end_intc2_irq | 57 | .end = end_intc2_irq |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static void disable_intc2_irq(unsigned int irq) | 60 | static void disable_intc2_irq(unsigned int irq) |