diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-01-14 10:07:25 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-02-06 11:53:14 -0500 |
commit | 70d21cdeef6331e67ed87262c894cd6601f0dccc (patch) | |
tree | 0bf2a011953a4794b26e28081d36af5ab43358c2 /arch | |
parent | ea6e942bea55b574bf2118bce8ee73185e754cfb (diff) |
[MIPS] use name instead of typename for each irq_chip
The "typename" field was obsoleted by the "name" field.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
32 files changed, 56 insertions, 56 deletions
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c index 9cf7b6715836..ea6e99fbe2f7 100644 --- a/arch/mips/au1000/common/irq.c +++ b/arch/mips/au1000/common/irq.c | |||
@@ -233,7 +233,7 @@ void restore_local_and_enable(int controller, unsigned long mask) | |||
233 | 233 | ||
234 | 234 | ||
235 | static struct irq_chip rise_edge_irq_type = { | 235 | static struct irq_chip rise_edge_irq_type = { |
236 | .typename = "Au1000 Rise Edge", | 236 | .name = "Au1000 Rise Edge", |
237 | .ack = mask_and_ack_rise_edge_irq, | 237 | .ack = mask_and_ack_rise_edge_irq, |
238 | .mask = local_disable_irq, | 238 | .mask = local_disable_irq, |
239 | .mask_ack = mask_and_ack_rise_edge_irq, | 239 | .mask_ack = mask_and_ack_rise_edge_irq, |
@@ -242,7 +242,7 @@ static struct irq_chip rise_edge_irq_type = { | |||
242 | }; | 242 | }; |
243 | 243 | ||
244 | static struct irq_chip fall_edge_irq_type = { | 244 | static struct irq_chip fall_edge_irq_type = { |
245 | .typename = "Au1000 Fall Edge", | 245 | .name = "Au1000 Fall Edge", |
246 | .ack = mask_and_ack_fall_edge_irq, | 246 | .ack = mask_and_ack_fall_edge_irq, |
247 | .mask = local_disable_irq, | 247 | .mask = local_disable_irq, |
248 | .mask_ack = mask_and_ack_fall_edge_irq, | 248 | .mask_ack = mask_and_ack_fall_edge_irq, |
@@ -251,7 +251,7 @@ static struct irq_chip fall_edge_irq_type = { | |||
251 | }; | 251 | }; |
252 | 252 | ||
253 | static struct irq_chip either_edge_irq_type = { | 253 | static struct irq_chip either_edge_irq_type = { |
254 | .typename = "Au1000 Rise or Fall Edge", | 254 | .name = "Au1000 Rise or Fall Edge", |
255 | .ack = mask_and_ack_either_edge_irq, | 255 | .ack = mask_and_ack_either_edge_irq, |
256 | .mask = local_disable_irq, | 256 | .mask = local_disable_irq, |
257 | .mask_ack = mask_and_ack_either_edge_irq, | 257 | .mask_ack = mask_and_ack_either_edge_irq, |
@@ -260,7 +260,7 @@ static struct irq_chip either_edge_irq_type = { | |||
260 | }; | 260 | }; |
261 | 261 | ||
262 | static struct irq_chip level_irq_type = { | 262 | static struct irq_chip level_irq_type = { |
263 | .typename = "Au1000 Level", | 263 | .name = "Au1000 Level", |
264 | .ack = mask_and_ack_level_irq, | 264 | .ack = mask_and_ack_level_irq, |
265 | .mask = local_disable_irq, | 265 | .mask = local_disable_irq, |
266 | .mask_ack = mask_and_ack_level_irq, | 266 | .mask_ack = mask_and_ack_level_irq, |
diff --git a/arch/mips/ddb5xxx/ddb5477/irq_5477.c b/arch/mips/ddb5xxx/ddb5477/irq_5477.c index 96249aa5df5d..98c3b15eb369 100644 --- a/arch/mips/ddb5xxx/ddb5477/irq_5477.c +++ b/arch/mips/ddb5xxx/ddb5477/irq_5477.c | |||
@@ -82,7 +82,7 @@ vrc5477_irq_end(unsigned int irq) | |||
82 | } | 82 | } |
83 | 83 | ||
84 | struct irq_chip vrc5477_irq_controller = { | 84 | struct irq_chip vrc5477_irq_controller = { |
85 | .typename = "vrc5477_irq", | 85 | .name = "vrc5477_irq", |
86 | .ack = vrc5477_irq_ack, | 86 | .ack = vrc5477_irq_ack, |
87 | .mask = vrc5477_irq_disable, | 87 | .mask = vrc5477_irq_disable, |
88 | .mask_ack = vrc5477_irq_ack, | 88 | .mask_ack = vrc5477_irq_ack, |
diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c index 4c7cb4048d35..3acb133668dc 100644 --- a/arch/mips/dec/ioasic-irq.c +++ b/arch/mips/dec/ioasic-irq.c | |||
@@ -62,7 +62,7 @@ static inline void end_ioasic_irq(unsigned int irq) | |||
62 | } | 62 | } |
63 | 63 | ||
64 | static struct irq_chip ioasic_irq_type = { | 64 | static struct irq_chip ioasic_irq_type = { |
65 | .typename = "IO-ASIC", | 65 | .name = "IO-ASIC", |
66 | .ack = ack_ioasic_irq, | 66 | .ack = ack_ioasic_irq, |
67 | .mask = mask_ioasic_irq, | 67 | .mask = mask_ioasic_irq, |
68 | .mask_ack = ack_ioasic_irq, | 68 | .mask_ack = ack_ioasic_irq, |
@@ -84,7 +84,7 @@ static inline void end_ioasic_dma_irq(unsigned int irq) | |||
84 | } | 84 | } |
85 | 85 | ||
86 | static struct irq_chip ioasic_dma_irq_type = { | 86 | static struct irq_chip ioasic_dma_irq_type = { |
87 | .typename = "IO-ASIC-DMA", | 87 | .name = "IO-ASIC-DMA", |
88 | .ack = ack_ioasic_dma_irq, | 88 | .ack = ack_ioasic_dma_irq, |
89 | .mask = mask_ioasic_dma_irq, | 89 | .mask = mask_ioasic_dma_irq, |
90 | .mask_ack = ack_ioasic_dma_irq, | 90 | .mask_ack = ack_ioasic_dma_irq, |
diff --git a/arch/mips/dec/kn02-irq.c b/arch/mips/dec/kn02-irq.c index 916e46b8ccd8..02439dc0ba83 100644 --- a/arch/mips/dec/kn02-irq.c +++ b/arch/mips/dec/kn02-irq.c | |||
@@ -58,7 +58,7 @@ static void ack_kn02_irq(unsigned int irq) | |||
58 | } | 58 | } |
59 | 59 | ||
60 | static struct irq_chip kn02_irq_type = { | 60 | static struct irq_chip kn02_irq_type = { |
61 | .typename = "KN02-CSR", | 61 | .name = "KN02-CSR", |
62 | .ack = ack_kn02_irq, | 62 | .ack = ack_kn02_irq, |
63 | .mask = mask_kn02_irq, | 63 | .mask = mask_kn02_irq, |
64 | .mask_ack = ack_kn02_irq, | 64 | .mask_ack = ack_kn02_irq, |
diff --git a/arch/mips/emma2rh/common/irq_emma2rh.c b/arch/mips/emma2rh/common/irq_emma2rh.c index 8d880f0b06ec..96df37b77759 100644 --- a/arch/mips/emma2rh/common/irq_emma2rh.c +++ b/arch/mips/emma2rh/common/irq_emma2rh.c | |||
@@ -57,7 +57,7 @@ static void emma2rh_irq_disable(unsigned int irq) | |||
57 | } | 57 | } |
58 | 58 | ||
59 | struct irq_chip emma2rh_irq_controller = { | 59 | struct irq_chip emma2rh_irq_controller = { |
60 | .typename = "emma2rh_irq", | 60 | .name = "emma2rh_irq", |
61 | .ack = emma2rh_irq_disable, | 61 | .ack = emma2rh_irq_disable, |
62 | .mask = emma2rh_irq_disable, | 62 | .mask = emma2rh_irq_disable, |
63 | .mask_ack = emma2rh_irq_disable, | 63 | .mask_ack = emma2rh_irq_disable, |
diff --git a/arch/mips/emma2rh/markeins/irq_markeins.c b/arch/mips/emma2rh/markeins/irq_markeins.c index 2116d9be5fa9..fba5c156f472 100644 --- a/arch/mips/emma2rh/markeins/irq_markeins.c +++ b/arch/mips/emma2rh/markeins/irq_markeins.c | |||
@@ -49,7 +49,7 @@ static void emma2rh_sw_irq_disable(unsigned int irq) | |||
49 | } | 49 | } |
50 | 50 | ||
51 | struct irq_chip emma2rh_sw_irq_controller = { | 51 | struct irq_chip emma2rh_sw_irq_controller = { |
52 | .typename = "emma2rh_sw_irq", | 52 | .name = "emma2rh_sw_irq", |
53 | .ack = emma2rh_sw_irq_disable, | 53 | .ack = emma2rh_sw_irq_disable, |
54 | .mask = emma2rh_sw_irq_disable, | 54 | .mask = emma2rh_sw_irq_disable, |
55 | .mask_ack = emma2rh_sw_irq_disable, | 55 | .mask_ack = emma2rh_sw_irq_disable, |
@@ -115,7 +115,7 @@ static void emma2rh_gpio_irq_end(unsigned int irq) | |||
115 | } | 115 | } |
116 | 116 | ||
117 | struct irq_chip emma2rh_gpio_irq_controller = { | 117 | struct irq_chip emma2rh_gpio_irq_controller = { |
118 | .typename = "emma2rh_gpio_irq", | 118 | .name = "emma2rh_gpio_irq", |
119 | .ack = emma2rh_gpio_irq_ack, | 119 | .ack = emma2rh_gpio_irq_ack, |
120 | .mask = emma2rh_gpio_irq_disable, | 120 | .mask = emma2rh_gpio_irq_disable, |
121 | .mask_ack = emma2rh_gpio_irq_ack, | 121 | .mask_ack = emma2rh_gpio_irq_ack, |
diff --git a/arch/mips/gt64120/ev64120/irq.c b/arch/mips/gt64120/ev64120/irq.c index b3e5796c81d7..04572b9c9642 100644 --- a/arch/mips/gt64120/ev64120/irq.c +++ b/arch/mips/gt64120/ev64120/irq.c | |||
@@ -88,7 +88,7 @@ static void end_ev64120_irq(unsigned int irq) | |||
88 | } | 88 | } |
89 | 89 | ||
90 | static struct irq_chip ev64120_irq_type = { | 90 | static struct irq_chip ev64120_irq_type = { |
91 | .typename = "EV64120", | 91 | .name = "EV64120", |
92 | .ack = disable_ev64120_irq, | 92 | .ack = disable_ev64120_irq, |
93 | .mask = disable_ev64120_irq, | 93 | .mask = disable_ev64120_irq, |
94 | .mask_ack = disable_ev64120_irq, | 94 | .mask_ack = disable_ev64120_irq, |
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c index f8d417b5c2bb..295892e4ce53 100644 --- a/arch/mips/jazz/irq.c +++ b/arch/mips/jazz/irq.c | |||
@@ -40,7 +40,7 @@ void disable_r4030_irq(unsigned int irq) | |||
40 | } | 40 | } |
41 | 41 | ||
42 | static struct irq_chip r4030_irq_type = { | 42 | static struct irq_chip r4030_irq_type = { |
43 | .typename = "R4030", | 43 | .name = "R4030", |
44 | .ack = disable_r4030_irq, | 44 | .ack = disable_r4030_irq, |
45 | .mask = disable_r4030_irq, | 45 | .mask = disable_r4030_irq, |
46 | .mask_ack = disable_r4030_irq, | 46 | .mask_ack = disable_r4030_irq, |
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c index 3da49c5aaf49..7d2c203cb406 100644 --- a/arch/mips/jmr3927/rbhma3100/irq.c +++ b/arch/mips/jmr3927/rbhma3100/irq.c | |||
@@ -439,7 +439,7 @@ void __init arch_init_irq(void) | |||
439 | } | 439 | } |
440 | 440 | ||
441 | static struct irq_chip jmr3927_irq_controller = { | 441 | static struct irq_chip jmr3927_irq_controller = { |
442 | .typename = "jmr3927_irq", | 442 | .name = "jmr3927_irq", |
443 | .ack = jmr3927_irq_ack, | 443 | .ack = jmr3927_irq_ack, |
444 | .mask = jmr3927_irq_disable, | 444 | .mask = jmr3927_irq_disable, |
445 | .mask_ack = jmr3927_irq_ack, | 445 | .mask_ack = jmr3927_irq_ack, |
diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c index bcaad6696082..2967537221e2 100644 --- a/arch/mips/kernel/irq-msc01.c +++ b/arch/mips/kernel/irq-msc01.c | |||
@@ -112,7 +112,7 @@ msc_bind_eic_interrupt (unsigned int irq, unsigned int set) | |||
112 | } | 112 | } |
113 | 113 | ||
114 | struct irq_chip msc_levelirq_type = { | 114 | struct irq_chip msc_levelirq_type = { |
115 | .typename = "SOC-it-Level", | 115 | .name = "SOC-it-Level", |
116 | .ack = level_mask_and_ack_msc_irq, | 116 | .ack = level_mask_and_ack_msc_irq, |
117 | .mask = mask_msc_irq, | 117 | .mask = mask_msc_irq, |
118 | .mask_ack = level_mask_and_ack_msc_irq, | 118 | .mask_ack = level_mask_and_ack_msc_irq, |
@@ -122,7 +122,7 @@ struct irq_chip msc_levelirq_type = { | |||
122 | }; | 122 | }; |
123 | 123 | ||
124 | struct irq_chip msc_edgeirq_type = { | 124 | struct irq_chip msc_edgeirq_type = { |
125 | .typename = "SOC-it-Edge", | 125 | .name = "SOC-it-Edge", |
126 | .ack = edge_mask_and_ack_msc_irq, | 126 | .ack = edge_mask_and_ack_msc_irq, |
127 | .mask = mask_msc_irq, | 127 | .mask = mask_msc_irq, |
128 | .mask_ack = edge_mask_and_ack_msc_irq, | 128 | .mask_ack = edge_mask_and_ack_msc_irq, |
diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c index efbd219845b5..bf6015ede00d 100644 --- a/arch/mips/kernel/irq-mv6434x.c +++ b/arch/mips/kernel/irq-mv6434x.c | |||
@@ -92,7 +92,7 @@ void ll_mv64340_irq(void) | |||
92 | } | 92 | } |
93 | 93 | ||
94 | struct irq_chip mv64340_irq_type = { | 94 | struct irq_chip mv64340_irq_type = { |
95 | .typename = "MV-64340", | 95 | .name = "MV-64340", |
96 | .ack = mask_mv64340_irq, | 96 | .ack = mask_mv64340_irq, |
97 | .mask = mask_mv64340_irq, | 97 | .mask = mask_mv64340_irq, |
98 | .mask_ack = mask_mv64340_irq, | 98 | .mask_ack = mask_mv64340_irq, |
diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c index a60cfe5f4d18..250732883488 100644 --- a/arch/mips/kernel/irq-rm7000.c +++ b/arch/mips/kernel/irq-rm7000.c | |||
@@ -28,7 +28,7 @@ static inline void mask_rm7k_irq(unsigned int irq) | |||
28 | } | 28 | } |
29 | 29 | ||
30 | static struct irq_chip rm7k_irq_controller = { | 30 | static struct irq_chip rm7k_irq_controller = { |
31 | .typename = "RM7000", | 31 | .name = "RM7000", |
32 | .ack = mask_rm7k_irq, | 32 | .ack = mask_rm7k_irq, |
33 | .mask = mask_rm7k_irq, | 33 | .mask = mask_rm7k_irq, |
34 | .mask_ack = mask_rm7k_irq, | 34 | .mask_ack = mask_rm7k_irq, |
diff --git a/arch/mips/kernel/irq-rm9000.c b/arch/mips/kernel/irq-rm9000.c index 27886db89a65..ae83d2df6f31 100644 --- a/arch/mips/kernel/irq-rm9000.c +++ b/arch/mips/kernel/irq-rm9000.c | |||
@@ -70,7 +70,7 @@ static void rm9k_perfcounter_irq_shutdown(unsigned int irq) | |||
70 | } | 70 | } |
71 | 71 | ||
72 | static struct irq_chip rm9k_irq_controller = { | 72 | static struct irq_chip rm9k_irq_controller = { |
73 | .typename = "RM9000", | 73 | .name = "RM9000", |
74 | .ack = mask_rm9k_irq, | 74 | .ack = mask_rm9k_irq, |
75 | .mask = mask_rm9k_irq, | 75 | .mask = mask_rm9k_irq, |
76 | .mask_ack = mask_rm9k_irq, | 76 | .mask_ack = mask_rm9k_irq, |
@@ -78,7 +78,7 @@ static struct irq_chip rm9k_irq_controller = { | |||
78 | }; | 78 | }; |
79 | 79 | ||
80 | static struct irq_chip rm9k_perfcounter_irq = { | 80 | static struct irq_chip rm9k_perfcounter_irq = { |
81 | .typename = "RM9000", | 81 | .name = "RM9000", |
82 | .startup = rm9k_perfcounter_irq_startup, | 82 | .startup = rm9k_perfcounter_irq_startup, |
83 | .shutdown = rm9k_perfcounter_irq_shutdown, | 83 | .shutdown = rm9k_perfcounter_irq_shutdown, |
84 | .ack = mask_rm9k_irq, | 84 | .ack = mask_rm9k_irq, |
diff --git a/arch/mips/kernel/irq_cpu.c b/arch/mips/kernel/irq_cpu.c index 6e73ddaeae74..7b66e03b5899 100644 --- a/arch/mips/kernel/irq_cpu.c +++ b/arch/mips/kernel/irq_cpu.c | |||
@@ -49,7 +49,7 @@ static inline void mask_mips_irq(unsigned int irq) | |||
49 | } | 49 | } |
50 | 50 | ||
51 | static struct irq_chip mips_cpu_irq_controller = { | 51 | static struct irq_chip mips_cpu_irq_controller = { |
52 | .typename = "MIPS", | 52 | .name = "MIPS", |
53 | .ack = mask_mips_irq, | 53 | .ack = mask_mips_irq, |
54 | .mask = mask_mips_irq, | 54 | .mask = mask_mips_irq, |
55 | .mask_ack = mask_mips_irq, | 55 | .mask_ack = mask_mips_irq, |
@@ -88,7 +88,7 @@ static void mips_mt_cpu_irq_ack(unsigned int irq) | |||
88 | } | 88 | } |
89 | 89 | ||
90 | static struct irq_chip mips_mt_cpu_irq_controller = { | 90 | static struct irq_chip mips_mt_cpu_irq_controller = { |
91 | .typename = "MIPS", | 91 | .name = "MIPS", |
92 | .startup = mips_mt_cpu_irq_startup, | 92 | .startup = mips_mt_cpu_irq_startup, |
93 | .ack = mips_mt_cpu_irq_ack, | 93 | .ack = mips_mt_cpu_irq_ack, |
94 | .mask = mask_mips_mt_irq, | 94 | .mask = mask_mips_mt_irq, |
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index 2affa5ff171c..9a622b9a1051 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c | |||
@@ -45,7 +45,7 @@ void enable_lasat_irq(unsigned int irq_nr) | |||
45 | } | 45 | } |
46 | 46 | ||
47 | static struct irq_chip lasat_irq_type = { | 47 | static struct irq_chip lasat_irq_type = { |
48 | .typename = "Lasat", | 48 | .name = "Lasat", |
49 | .ack = disable_lasat_irq, | 49 | .ack = disable_lasat_irq, |
50 | .mask = disable_lasat_irq, | 50 | .mask = disable_lasat_irq, |
51 | .mask_ack = disable_lasat_irq, | 51 | .mask_ack = disable_lasat_irq, |
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c index 85482a631e8c..6cfcd8fedcce 100644 --- a/arch/mips/mips-boards/atlas/atlas_int.c +++ b/arch/mips/mips-boards/atlas/atlas_int.c | |||
@@ -69,7 +69,7 @@ static void end_atlas_irq(unsigned int irq) | |||
69 | } | 69 | } |
70 | 70 | ||
71 | static struct irq_chip atlas_irq_type = { | 71 | static struct irq_chip atlas_irq_type = { |
72 | .typename = "Atlas", | 72 | .name = "Atlas", |
73 | .ack = disable_atlas_irq, | 73 | .ack = disable_atlas_irq, |
74 | .mask = disable_atlas_irq, | 74 | .mask = disable_atlas_irq, |
75 | .mask_ack = disable_atlas_irq, | 75 | .mask_ack = disable_atlas_irq, |
diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c index bb11fef08472..186a140fd2a9 100644 --- a/arch/mips/momentum/ocelot_c/cpci-irq.c +++ b/arch/mips/momentum/ocelot_c/cpci-irq.c | |||
@@ -84,7 +84,7 @@ void ll_cpci_irq(void) | |||
84 | } | 84 | } |
85 | 85 | ||
86 | struct irq_chip cpci_irq_type = { | 86 | struct irq_chip cpci_irq_type = { |
87 | .typename = "CPCI/FPGA", | 87 | .name = "CPCI/FPGA", |
88 | .ack = mask_cpci_irq, | 88 | .ack = mask_cpci_irq, |
89 | .mask = mask_cpci_irq, | 89 | .mask = mask_cpci_irq, |
90 | .mask_ack = mask_cpci_irq, | 90 | .mask_ack = mask_cpci_irq, |
diff --git a/arch/mips/momentum/ocelot_c/uart-irq.c b/arch/mips/momentum/ocelot_c/uart-irq.c index a7a80c0da569..de1a31ee52f3 100644 --- a/arch/mips/momentum/ocelot_c/uart-irq.c +++ b/arch/mips/momentum/ocelot_c/uart-irq.c | |||
@@ -77,7 +77,7 @@ void ll_uart_irq(void) | |||
77 | } | 77 | } |
78 | 78 | ||
79 | struct irq_chip uart_irq_type = { | 79 | struct irq_chip uart_irq_type = { |
80 | .typename = "UART/FPGA", | 80 | .name = "UART/FPGA", |
81 | .ack = mask_uart_irq, | 81 | .ack = mask_uart_irq, |
82 | .mask = mask_uart_irq, | 82 | .mask = mask_uart_irq, |
83 | .mask_ack = mask_uart_irq, | 83 | .mask_ack = mask_uart_irq, |
diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c index 2c36c108c4d6..d48665ebd33c 100644 --- a/arch/mips/philips/pnx8550/common/int.c +++ b/arch/mips/philips/pnx8550/common/int.c | |||
@@ -159,7 +159,7 @@ int pnx8550_set_gic_priority(int irq, int priority) | |||
159 | } | 159 | } |
160 | 160 | ||
161 | static struct irq_chip level_irq_type = { | 161 | static struct irq_chip level_irq_type = { |
162 | .typename = "PNX Level IRQ", | 162 | .name = "PNX Level IRQ", |
163 | .ack = mask_irq, | 163 | .ack = mask_irq, |
164 | .mask = mask_irq, | 164 | .mask = mask_irq, |
165 | .mask_ack = mask_irq, | 165 | .mask_ack = mask_irq, |
diff --git a/arch/mips/sgi-ip22/ip22-eisa.c b/arch/mips/sgi-ip22/ip22-eisa.c index a1a9af6da7bf..6b6e97b90c6e 100644 --- a/arch/mips/sgi-ip22/ip22-eisa.c +++ b/arch/mips/sgi-ip22/ip22-eisa.c | |||
@@ -139,7 +139,7 @@ static void end_eisa1_irq(unsigned int irq) | |||
139 | } | 139 | } |
140 | 140 | ||
141 | static struct irq_chip ip22_eisa1_irq_type = { | 141 | static struct irq_chip ip22_eisa1_irq_type = { |
142 | .typename = "IP22 EISA", | 142 | .name = "IP22 EISA", |
143 | .startup = startup_eisa1_irq, | 143 | .startup = startup_eisa1_irq, |
144 | .ack = mask_and_ack_eisa1_irq, | 144 | .ack = mask_and_ack_eisa1_irq, |
145 | .mask = disable_eisa1_irq, | 145 | .mask = disable_eisa1_irq, |
@@ -194,7 +194,7 @@ static void end_eisa2_irq(unsigned int irq) | |||
194 | } | 194 | } |
195 | 195 | ||
196 | static struct irq_chip ip22_eisa2_irq_type = { | 196 | static struct irq_chip ip22_eisa2_irq_type = { |
197 | .typename = "IP22 EISA", | 197 | .name = "IP22 EISA", |
198 | .startup = startup_eisa2_irq, | 198 | .startup = startup_eisa2_irq, |
199 | .ack = mask_and_ack_eisa2_irq, | 199 | .ack = mask_and_ack_eisa2_irq, |
200 | .mask = disable_eisa2_irq, | 200 | .mask = disable_eisa2_irq, |
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c index f3d2ae374c72..b454924aeb56 100644 --- a/arch/mips/sgi-ip22/ip22-int.c +++ b/arch/mips/sgi-ip22/ip22-int.c | |||
@@ -53,7 +53,7 @@ static void disable_local0_irq(unsigned int irq) | |||
53 | } | 53 | } |
54 | 54 | ||
55 | static struct irq_chip ip22_local0_irq_type = { | 55 | static struct irq_chip ip22_local0_irq_type = { |
56 | .typename = "IP22 local 0", | 56 | .name = "IP22 local 0", |
57 | .ack = disable_local0_irq, | 57 | .ack = disable_local0_irq, |
58 | .mask = disable_local0_irq, | 58 | .mask = disable_local0_irq, |
59 | .mask_ack = disable_local0_irq, | 59 | .mask_ack = disable_local0_irq, |
@@ -74,7 +74,7 @@ void disable_local1_irq(unsigned int irq) | |||
74 | } | 74 | } |
75 | 75 | ||
76 | static struct irq_chip ip22_local1_irq_type = { | 76 | static struct irq_chip ip22_local1_irq_type = { |
77 | .typename = "IP22 local 1", | 77 | .name = "IP22 local 1", |
78 | .ack = disable_local1_irq, | 78 | .ack = disable_local1_irq, |
79 | .mask = disable_local1_irq, | 79 | .mask = disable_local1_irq, |
80 | .mask_ack = disable_local1_irq, | 80 | .mask_ack = disable_local1_irq, |
@@ -95,7 +95,7 @@ void disable_local2_irq(unsigned int irq) | |||
95 | } | 95 | } |
96 | 96 | ||
97 | static struct irq_chip ip22_local2_irq_type = { | 97 | static struct irq_chip ip22_local2_irq_type = { |
98 | .typename = "IP22 local 2", | 98 | .name = "IP22 local 2", |
99 | .ack = disable_local2_irq, | 99 | .ack = disable_local2_irq, |
100 | .mask = disable_local2_irq, | 100 | .mask = disable_local2_irq, |
101 | .mask_ack = disable_local2_irq, | 101 | .mask_ack = disable_local2_irq, |
@@ -116,7 +116,7 @@ void disable_local3_irq(unsigned int irq) | |||
116 | } | 116 | } |
117 | 117 | ||
118 | static struct irq_chip ip22_local3_irq_type = { | 118 | static struct irq_chip ip22_local3_irq_type = { |
119 | .typename = "IP22 local 3", | 119 | .name = "IP22 local 3", |
120 | .ack = disable_local3_irq, | 120 | .ack = disable_local3_irq, |
121 | .mask = disable_local3_irq, | 121 | .mask = disable_local3_irq, |
122 | .mask_ack = disable_local3_irq, | 122 | .mask_ack = disable_local3_irq, |
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c index 319f8803ef6f..60ade7690e09 100644 --- a/arch/mips/sgi-ip27/ip27-irq.c +++ b/arch/mips/sgi-ip27/ip27-irq.c | |||
@@ -333,7 +333,7 @@ static inline void disable_bridge_irq(unsigned int irq) | |||
333 | } | 333 | } |
334 | 334 | ||
335 | static struct irq_chip bridge_irq_type = { | 335 | static struct irq_chip bridge_irq_type = { |
336 | .typename = "bridge", | 336 | .name = "bridge", |
337 | .startup = startup_bridge_irq, | 337 | .startup = startup_bridge_irq, |
338 | .shutdown = shutdown_bridge_irq, | 338 | .shutdown = shutdown_bridge_irq, |
339 | .ack = disable_bridge_irq, | 339 | .ack = disable_bridge_irq, |
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index c20e9899b34b..9ce513629b14 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c | |||
@@ -181,7 +181,7 @@ static void disable_rt_irq(unsigned int irq) | |||
181 | } | 181 | } |
182 | 182 | ||
183 | static struct irq_chip rt_irq_type = { | 183 | static struct irq_chip rt_irq_type = { |
184 | .typename = "SN HUB RT timer", | 184 | .name = "SN HUB RT timer", |
185 | .ack = disable_rt_irq, | 185 | .ack = disable_rt_irq, |
186 | .mask = disable_rt_irq, | 186 | .mask = disable_rt_irq, |
187 | .mask_ack = disable_rt_irq, | 187 | .mask_ack = disable_rt_irq, |
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c index ae063864c026..8c450d9e8696 100644 --- a/arch/mips/sgi-ip32/ip32-irq.c +++ b/arch/mips/sgi-ip32/ip32-irq.c | |||
@@ -144,7 +144,7 @@ static void end_cpu_irq(unsigned int irq) | |||
144 | } | 144 | } |
145 | 145 | ||
146 | static struct irq_chip ip32_cpu_interrupt = { | 146 | static struct irq_chip ip32_cpu_interrupt = { |
147 | .typename = "IP32 CPU", | 147 | .name = "IP32 CPU", |
148 | .ack = disable_cpu_irq, | 148 | .ack = disable_cpu_irq, |
149 | .mask = disable_cpu_irq, | 149 | .mask = disable_cpu_irq, |
150 | .mask_ack = disable_cpu_irq, | 150 | .mask_ack = disable_cpu_irq, |
@@ -193,7 +193,7 @@ static void end_crime_irq(unsigned int irq) | |||
193 | } | 193 | } |
194 | 194 | ||
195 | static struct irq_chip ip32_crime_interrupt = { | 195 | static struct irq_chip ip32_crime_interrupt = { |
196 | .typename = "IP32 CRIME", | 196 | .name = "IP32 CRIME", |
197 | .ack = mask_and_ack_crime_irq, | 197 | .ack = mask_and_ack_crime_irq, |
198 | .mask = disable_crime_irq, | 198 | .mask = disable_crime_irq, |
199 | .mask_ack = mask_and_ack_crime_irq, | 199 | .mask_ack = mask_and_ack_crime_irq, |
@@ -234,7 +234,7 @@ static void end_macepci_irq(unsigned int irq) | |||
234 | } | 234 | } |
235 | 235 | ||
236 | static struct irq_chip ip32_macepci_interrupt = { | 236 | static struct irq_chip ip32_macepci_interrupt = { |
237 | .typename = "IP32 MACE PCI", | 237 | .name = "IP32 MACE PCI", |
238 | .ack = disable_macepci_irq, | 238 | .ack = disable_macepci_irq, |
239 | .mask = disable_macepci_irq, | 239 | .mask = disable_macepci_irq, |
240 | .mask_ack = disable_macepci_irq, | 240 | .mask_ack = disable_macepci_irq, |
@@ -347,7 +347,7 @@ static void end_maceisa_irq(unsigned irq) | |||
347 | } | 347 | } |
348 | 348 | ||
349 | static struct irq_chip ip32_maceisa_interrupt = { | 349 | static struct irq_chip ip32_maceisa_interrupt = { |
350 | .typename = "IP32 MACE ISA", | 350 | .name = "IP32 MACE ISA", |
351 | .ack = mask_and_ack_maceisa_irq, | 351 | .ack = mask_and_ack_maceisa_irq, |
352 | .mask = disable_maceisa_irq, | 352 | .mask = disable_maceisa_irq, |
353 | .mask_ack = mask_and_ack_maceisa_irq, | 353 | .mask_ack = mask_and_ack_maceisa_irq, |
@@ -379,7 +379,7 @@ static void end_mace_irq(unsigned int irq) | |||
379 | } | 379 | } |
380 | 380 | ||
381 | static struct irq_chip ip32_mace_interrupt = { | 381 | static struct irq_chip ip32_mace_interrupt = { |
382 | .typename = "IP32 MACE", | 382 | .name = "IP32 MACE", |
383 | .ack = disable_mace_irq, | 383 | .ack = disable_mace_irq, |
384 | .mask = disable_mace_irq, | 384 | .mask = disable_mace_irq, |
385 | .mask_ack = disable_mace_irq, | 385 | .mask_ack = disable_mace_irq, |
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c index 2e8f6b2e2420..1dc5d05d8962 100644 --- a/arch/mips/sibyte/bcm1480/irq.c +++ b/arch/mips/sibyte/bcm1480/irq.c | |||
@@ -82,7 +82,7 @@ extern char sb1250_duart_present[]; | |||
82 | #endif | 82 | #endif |
83 | 83 | ||
84 | static struct irq_chip bcm1480_irq_type = { | 84 | static struct irq_chip bcm1480_irq_type = { |
85 | .typename = "BCM1480-IMR", | 85 | .name = "BCM1480-IMR", |
86 | .ack = ack_bcm1480_irq, | 86 | .ack = ack_bcm1480_irq, |
87 | .mask = disable_bcm1480_irq, | 87 | .mask = disable_bcm1480_irq, |
88 | .mask_ack = ack_bcm1480_irq, | 88 | .mask_ack = ack_bcm1480_irq, |
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c index 82ce7533053f..148239446e6e 100644 --- a/arch/mips/sibyte/sb1250/irq.c +++ b/arch/mips/sibyte/sb1250/irq.c | |||
@@ -67,7 +67,7 @@ extern char sb1250_duart_present[]; | |||
67 | #endif | 67 | #endif |
68 | 68 | ||
69 | static struct irq_chip sb1250_irq_type = { | 69 | static struct irq_chip sb1250_irq_type = { |
70 | .typename = "SB1250-IMR", | 70 | .name = "SB1250-IMR", |
71 | .ack = ack_sb1250_irq, | 71 | .ack = ack_sb1250_irq, |
72 | .mask = disable_sb1250_irq, | 72 | .mask = disable_sb1250_irq, |
73 | .mask_ack = ack_sb1250_irq, | 73 | .mask_ack = ack_sb1250_irq, |
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c index 8511bcc6d99d..039e8e540508 100644 --- a/arch/mips/sni/irq.c +++ b/arch/mips/sni/irq.c | |||
@@ -37,7 +37,7 @@ static void end_pciasic_irq(unsigned int irq) | |||
37 | } | 37 | } |
38 | 38 | ||
39 | static struct irq_chip pciasic_irq_type = { | 39 | static struct irq_chip pciasic_irq_type = { |
40 | .typename = "ASIC-PCI", | 40 | .name = "ASIC-PCI", |
41 | .ack = disable_pciasic_irq, | 41 | .ack = disable_pciasic_irq, |
42 | .mask = disable_pciasic_irq, | 42 | .mask = disable_pciasic_irq, |
43 | .mask_ack = disable_pciasic_irq, | 43 | .mask_ack = disable_pciasic_irq, |
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c index ed4a19adf361..e7f3e5b84dcf 100644 --- a/arch/mips/tx4927/common/tx4927_irq.c +++ b/arch/mips/tx4927/common/tx4927_irq.c | |||
@@ -120,7 +120,7 @@ static void tx4927_irq_pic_disable(unsigned int irq); | |||
120 | 120 | ||
121 | #define TX4927_CP0_NAME "TX4927-CP0" | 121 | #define TX4927_CP0_NAME "TX4927-CP0" |
122 | static struct irq_chip tx4927_irq_cp0_type = { | 122 | static struct irq_chip tx4927_irq_cp0_type = { |
123 | .typename = TX4927_CP0_NAME, | 123 | .name = TX4927_CP0_NAME, |
124 | .ack = tx4927_irq_cp0_disable, | 124 | .ack = tx4927_irq_cp0_disable, |
125 | .mask = tx4927_irq_cp0_disable, | 125 | .mask = tx4927_irq_cp0_disable, |
126 | .mask_ack = tx4927_irq_cp0_disable, | 126 | .mask_ack = tx4927_irq_cp0_disable, |
@@ -129,7 +129,7 @@ static struct irq_chip tx4927_irq_cp0_type = { | |||
129 | 129 | ||
130 | #define TX4927_PIC_NAME "TX4927-PIC" | 130 | #define TX4927_PIC_NAME "TX4927-PIC" |
131 | static struct irq_chip tx4927_irq_pic_type = { | 131 | static struct irq_chip tx4927_irq_pic_type = { |
132 | .typename = TX4927_PIC_NAME, | 132 | .name = TX4927_PIC_NAME, |
133 | .ack = tx4927_irq_pic_disable, | 133 | .ack = tx4927_irq_pic_disable, |
134 | .mask = tx4927_irq_pic_disable, | 134 | .mask = tx4927_irq_pic_disable, |
135 | .mask_ack = tx4927_irq_pic_disable, | 135 | .mask_ack = tx4927_irq_pic_disable, |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c index b54b529a29f9..dcce88f403c9 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | |||
@@ -228,7 +228,7 @@ static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq); | |||
228 | 228 | ||
229 | #define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC" | 229 | #define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC" |
230 | static struct irq_chip toshiba_rbtx4927_irq_ioc_type = { | 230 | static struct irq_chip toshiba_rbtx4927_irq_ioc_type = { |
231 | .typename = TOSHIBA_RBTX4927_IOC_NAME, | 231 | .name = TOSHIBA_RBTX4927_IOC_NAME, |
232 | .ack = toshiba_rbtx4927_irq_ioc_disable, | 232 | .ack = toshiba_rbtx4927_irq_ioc_disable, |
233 | .mask = toshiba_rbtx4927_irq_ioc_disable, | 233 | .mask = toshiba_rbtx4927_irq_ioc_disable, |
234 | .mask_ack = toshiba_rbtx4927_irq_ioc_disable, | 234 | .mask_ack = toshiba_rbtx4927_irq_ioc_disable, |
@@ -241,7 +241,7 @@ static struct irq_chip toshiba_rbtx4927_irq_ioc_type = { | |||
241 | #ifdef CONFIG_TOSHIBA_FPCIB0 | 241 | #ifdef CONFIG_TOSHIBA_FPCIB0 |
242 | #define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA" | 242 | #define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA" |
243 | static struct irq_chip toshiba_rbtx4927_irq_isa_type = { | 243 | static struct irq_chip toshiba_rbtx4927_irq_isa_type = { |
244 | .typename = TOSHIBA_RBTX4927_ISA_NAME, | 244 | .name = TOSHIBA_RBTX4927_ISA_NAME, |
245 | .ack = toshiba_rbtx4927_irq_isa_mask_and_ack, | 245 | .ack = toshiba_rbtx4927_irq_isa_mask_and_ack, |
246 | .mask = toshiba_rbtx4927_irq_isa_disable, | 246 | .mask = toshiba_rbtx4927_irq_isa_disable, |
247 | .mask_ack = toshiba_rbtx4927_irq_isa_mask_and_ack, | 247 | .mask_ack = toshiba_rbtx4927_irq_isa_mask_and_ack, |
@@ -490,13 +490,13 @@ void toshiba_rbtx4927_irq_dump(char *key) | |||
490 | { | 490 | { |
491 | u32 i, j = 0; | 491 | u32 i, j = 0; |
492 | for (i = 0; i < NR_IRQS; i++) { | 492 | for (i = 0; i < NR_IRQS; i++) { |
493 | if (strcmp(irq_desc[i].chip->typename, "none") | 493 | if (strcmp(irq_desc[i].chip->name, "none") |
494 | == 0) | 494 | == 0) |
495 | continue; | 495 | continue; |
496 | 496 | ||
497 | if ((i >= 1) | 497 | if ((i >= 1) |
498 | && (irq_desc[i - 1].chip->typename == | 498 | && (irq_desc[i - 1].chip->name == |
499 | irq_desc[i].chip->typename)) { | 499 | irq_desc[i].chip->name)) { |
500 | j++; | 500 | j++; |
501 | } else { | 501 | } else { |
502 | j = 0; | 502 | j = 0; |
@@ -510,7 +510,7 @@ void toshiba_rbtx4927_irq_dump(char *key) | |||
510 | (u32) (irq_desc[i].action ? irq_desc[i]. | 510 | (u32) (irq_desc[i].action ? irq_desc[i]. |
511 | action->handler : 0), | 511 | action->handler : 0), |
512 | irq_desc[i].depth, | 512 | irq_desc[i].depth, |
513 | irq_desc[i].chip->typename, j); | 513 | irq_desc[i].chip->name, j); |
514 | } | 514 | } |
515 | } | 515 | } |
516 | #endif | 516 | #endif |
diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c index a347b424d91c..3a2dbfc25014 100644 --- a/arch/mips/tx4938/common/irq.c +++ b/arch/mips/tx4938/common/irq.c | |||
@@ -49,7 +49,7 @@ static void tx4938_irq_pic_disable(unsigned int irq); | |||
49 | 49 | ||
50 | #define TX4938_CP0_NAME "TX4938-CP0" | 50 | #define TX4938_CP0_NAME "TX4938-CP0" |
51 | static struct irq_chip tx4938_irq_cp0_type = { | 51 | static struct irq_chip tx4938_irq_cp0_type = { |
52 | .typename = TX4938_CP0_NAME, | 52 | .name = TX4938_CP0_NAME, |
53 | .ack = tx4938_irq_cp0_disable, | 53 | .ack = tx4938_irq_cp0_disable, |
54 | .mask = tx4938_irq_cp0_disable, | 54 | .mask = tx4938_irq_cp0_disable, |
55 | .mask_ack = tx4938_irq_cp0_disable, | 55 | .mask_ack = tx4938_irq_cp0_disable, |
@@ -58,7 +58,7 @@ static struct irq_chip tx4938_irq_cp0_type = { | |||
58 | 58 | ||
59 | #define TX4938_PIC_NAME "TX4938-PIC" | 59 | #define TX4938_PIC_NAME "TX4938-PIC" |
60 | static struct irq_chip tx4938_irq_pic_type = { | 60 | static struct irq_chip tx4938_irq_pic_type = { |
61 | .typename = TX4938_PIC_NAME, | 61 | .name = TX4938_PIC_NAME, |
62 | .ack = tx4938_irq_pic_disable, | 62 | .ack = tx4938_irq_pic_disable, |
63 | .mask = tx4938_irq_pic_disable, | 63 | .mask = tx4938_irq_pic_disable, |
64 | .mask_ack = tx4938_irq_pic_disable, | 64 | .mask_ack = tx4938_irq_pic_disable, |
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c index b6f363d08011..2e96dbb248b1 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c | |||
@@ -92,7 +92,7 @@ static void toshiba_rbtx4938_irq_ioc_disable(unsigned int irq); | |||
92 | 92 | ||
93 | #define TOSHIBA_RBTX4938_IOC_NAME "RBTX4938-IOC" | 93 | #define TOSHIBA_RBTX4938_IOC_NAME "RBTX4938-IOC" |
94 | static struct irq_chip toshiba_rbtx4938_irq_ioc_type = { | 94 | static struct irq_chip toshiba_rbtx4938_irq_ioc_type = { |
95 | .typename = TOSHIBA_RBTX4938_IOC_NAME, | 95 | .name = TOSHIBA_RBTX4938_IOC_NAME, |
96 | .ack = toshiba_rbtx4938_irq_ioc_disable, | 96 | .ack = toshiba_rbtx4938_irq_ioc_disable, |
97 | .mask = toshiba_rbtx4938_irq_ioc_disable, | 97 | .mask = toshiba_rbtx4938_irq_ioc_disable, |
98 | .mask_ack = toshiba_rbtx4938_irq_ioc_disable, | 98 | .mask_ack = toshiba_rbtx4938_irq_ioc_disable, |
diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c index 34622f3f5ff4..adabc6bad440 100644 --- a/arch/mips/vr41xx/common/icu.c +++ b/arch/mips/vr41xx/common/icu.c | |||
@@ -453,7 +453,7 @@ static void enable_sysint1_irq(unsigned int irq) | |||
453 | } | 453 | } |
454 | 454 | ||
455 | static struct irq_chip sysint1_irq_type = { | 455 | static struct irq_chip sysint1_irq_type = { |
456 | .typename = "SYSINT1", | 456 | .name = "SYSINT1", |
457 | .ack = disable_sysint1_irq, | 457 | .ack = disable_sysint1_irq, |
458 | .mask = disable_sysint1_irq, | 458 | .mask = disable_sysint1_irq, |
459 | .mask_ack = disable_sysint1_irq, | 459 | .mask_ack = disable_sysint1_irq, |
@@ -471,7 +471,7 @@ static void enable_sysint2_irq(unsigned int irq) | |||
471 | } | 471 | } |
472 | 472 | ||
473 | static struct irq_chip sysint2_irq_type = { | 473 | static struct irq_chip sysint2_irq_type = { |
474 | .typename = "SYSINT2", | 474 | .name = "SYSINT2", |
475 | .ack = disable_sysint2_irq, | 475 | .ack = disable_sysint2_irq, |
476 | .mask = disable_sysint2_irq, | 476 | .mask = disable_sysint2_irq, |
477 | .mask_ack = disable_sysint2_irq, | 477 | .mask_ack = disable_sysint2_irq, |