Commit a9eb076b21425929ce543978db03265d9db210de

Authored by Thomas Gleixner
1 parent f38c02f3b3

alpha: Convert to new irq function names

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 20 changed files with 38 additions and 34 deletions Side-by-side Diff

arch/alpha/kernel/irq.c
... ... @@ -102,7 +102,7 @@
102 102 for_each_online_cpu(j)
103 103 seq_printf(p, "%10u ", kstat_irqs_cpu(irq, j));
104 104 #endif
105   - seq_printf(p, " %14s", get_irq_desc_chip(desc)->name);
  105 + seq_printf(p, " %14s", irq_desc_get_chip(desc)->name);
106 106 seq_printf(p, " %c%s",
107 107 (action->flags & IRQF_DISABLED)?'+':' ',
108 108 action->name);
arch/alpha/kernel/irq_alpha.c
... ... @@ -228,7 +228,7 @@
228 228 void __init
229 229 init_rtc_irq(void)
230 230 {
231   - set_irq_chip_and_handler_name(RTC_IRQ, &no_irq_chip,
  231 + irq_set_chip_and_handler_name(RTC_IRQ, &no_irq_chip,
232 232 handle_simple_irq, "RTC");
233 233 setup_irq(RTC_IRQ, &timer_irqaction);
234 234 }
arch/alpha/kernel/irq_i8259.c
... ... @@ -92,7 +92,7 @@
92 92 outb(0xff, 0xA1); /* mask all of 8259A-2 */
93 93  
94 94 for (i = 0; i < 16; i++) {
95   - set_irq_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);
  95 + irq_set_chip_and_handler(i, &i8259a_irq_type, handle_level_irq);
96 96 }
97 97  
98 98 setup_irq(2, &cascade);
arch/alpha/kernel/irq_pyxis.c
... ... @@ -102,7 +102,7 @@
102 102 for (i = 16; i < 48; ++i) {
103 103 if ((ignore_mask >> i) & 1)
104 104 continue;
105   - set_irq_chip_and_handler(i, &pyxis_irq_type, handle_level_irq);
  105 + irq_set_chip_and_handler(i, &pyxis_irq_type, handle_level_irq);
106 106 irq_set_status_flags(i, IRQ_LEVEL);
107 107 }
108 108  
arch/alpha/kernel/irq_srm.c
... ... @@ -51,7 +51,7 @@
51 51 for (i = 16; i < max; ++i) {
52 52 if (i < 64 && ((ignore_mask >> i) & 1))
53 53 continue;
54   - set_irq_chip_and_handler(i, &srm_irq_type, handle_level_irq);
  54 + irq_set_chip_and_handler(i, &srm_irq_type, handle_level_irq);
55 55 irq_set_status_flags(i, IRQ_LEVEL);
56 56 }
57 57 }
arch/alpha/kernel/sys_alcor.c
... ... @@ -125,7 +125,7 @@
125 125 on while IRQ probing. */
126 126 if (i >= 16+20 && i <= 16+30)
127 127 continue;
128   - set_irq_chip_and_handler(i, &alcor_irq_type, handle_level_irq);
  128 + irq_set_chip_and_handler(i, &alcor_irq_type, handle_level_irq);
129 129 irq_set_status_flags(i, IRQ_LEVEL);
130 130 }
131 131 i8259a_irq_type.irq_ack = alcor_isa_mask_and_ack_irq;
arch/alpha/kernel/sys_cabriolet.c
... ... @@ -105,8 +105,8 @@
105 105 outb(0xff, 0x806);
106 106  
107 107 for (i = 16; i < 35; ++i) {
108   - set_irq_chip_and_handler(i, &cabriolet_irq_type,
109   - handle_level_irq);
  108 + irq_set_chip_and_handler(i, &cabriolet_irq_type,
  109 + handle_level_irq);
110 110 irq_set_status_flags(i, IRQ_LEVEL);
111 111 }
112 112 }
arch/alpha/kernel/sys_dp264.c
... ... @@ -270,7 +270,7 @@
270 270 {
271 271 long i;
272 272 for (i = imin; i <= imax; ++i) {
273   - set_irq_chip_and_handler(i, ops, handle_level_irq);
  273 + irq_set_chip_and_handler(i, ops, handle_level_irq);
274 274 irq_set_status_flags(i, IRQ_LEVEL);
275 275 }
276 276 }
arch/alpha/kernel/sys_eb64p.c
... ... @@ -118,7 +118,7 @@
118 118 init_i8259a_irqs();
119 119  
120 120 for (i = 16; i < 32; ++i) {
121   - set_irq_chip_and_handler(i, &eb64p_irq_type, handle_level_irq);
  121 + irq_set_chip_and_handler(i, &eb64p_irq_type, handle_level_irq);
122 122 irq_set_status_flags(i, IRQ_LEVEL);
123 123 }
124 124  
arch/alpha/kernel/sys_eiger.c
... ... @@ -138,7 +138,7 @@
138 138 init_i8259a_irqs();
139 139  
140 140 for (i = 16; i < 128; ++i) {
141   - set_irq_chip_and_handler(i, &eiger_irq_type, handle_level_irq);
  141 + irq_set_chip_and_handler(i, &eiger_irq_type, handle_level_irq);
142 142 irq_set_status_flags(i, IRQ_LEVEL);
143 143 }
144 144 }
arch/alpha/kernel/sys_jensen.c
... ... @@ -171,11 +171,11 @@
171 171 {
172 172 init_i8259a_irqs();
173 173  
174   - set_irq_chip_and_handler(1, &jensen_local_irq_type, handle_level_irq);
175   - set_irq_chip_and_handler(4, &jensen_local_irq_type, handle_level_irq);
176   - set_irq_chip_and_handler(3, &jensen_local_irq_type, handle_level_irq);
177   - set_irq_chip_and_handler(7, &jensen_local_irq_type, handle_level_irq);
178   - set_irq_chip_and_handler(9, &jensen_local_irq_type, handle_level_irq);
  174 + irq_set_chip_and_handler(1, &jensen_local_irq_type, handle_level_irq);
  175 + irq_set_chip_and_handler(4, &jensen_local_irq_type, handle_level_irq);
  176 + irq_set_chip_and_handler(3, &jensen_local_irq_type, handle_level_irq);
  177 + irq_set_chip_and_handler(7, &jensen_local_irq_type, handle_level_irq);
  178 + irq_set_chip_and_handler(9, &jensen_local_irq_type, handle_level_irq);
179 179  
180 180 common_init_isa_dma();
181 181 }
arch/alpha/kernel/sys_marvel.c
... ... @@ -276,7 +276,7 @@
276 276  
277 277 /* Set up the lsi irqs. */
278 278 for (i = 0; i < 128; ++i) {
279   - set_irq_chip_and_handler(base + i, lsi_ops, handle_level_irq);
  279 + irq_set_chip_and_handler(base + i, lsi_ops, handle_level_irq);
280 280 irq_set_status_flags(i, IRQ_LEVEL);
281 281 }
282 282  
... ... @@ -290,7 +290,7 @@
290 290  
291 291 /* Set up the msi irqs. */
292 292 for (i = 128; i < (128 + 512); ++i) {
293   - set_irq_chip_and_handler(base + i, msi_ops, handle_level_irq);
  293 + irq_set_chip_and_handler(base + i, msi_ops, handle_level_irq);
294 294 irq_set_status_flags(i, IRQ_LEVEL);
295 295 }
296 296  
... ... @@ -308,8 +308,8 @@
308 308  
309 309 /* Reserve the legacy irqs. */
310 310 for (i = 0; i < 16; ++i) {
311   - set_irq_chip_and_handler(i, &marvel_legacy_irq_type,
312   - handle_level_irq);
  311 + irq_set_chip_and_handler(i, &marvel_legacy_irq_type,
  312 + handle_level_irq);
313 313 }
314 314  
315 315 /* Init the io7 irqs. */
arch/alpha/kernel/sys_mikasa.c
... ... @@ -98,7 +98,8 @@
98 98 mikasa_update_irq_hw(0);
99 99  
100 100 for (i = 16; i < 32; ++i) {
101   - set_irq_chip_and_handler(i, &mikasa_irq_type, handle_level_irq);
  101 + irq_set_chip_and_handler(i, &mikasa_irq_type,
  102 + handle_level_irq);
102 103 irq_set_status_flags(i, IRQ_LEVEL);
103 104 }
104 105  
arch/alpha/kernel/sys_noritake.c
... ... @@ -127,7 +127,8 @@
127 127 outw(0, 0x54c);
128 128  
129 129 for (i = 16; i < 48; ++i) {
130   - set_irq_chip_and_handler(i, &noritake_irq_type, handle_level_irq);
  130 + irq_set_chip_and_handler(i, &noritake_irq_type,
  131 + handle_level_irq);
131 132 irq_set_status_flags(i, IRQ_LEVEL);
132 133 }
133 134  
arch/alpha/kernel/sys_rawhide.c
... ... @@ -180,7 +180,8 @@
180 180 }
181 181  
182 182 for (i = 16; i < 128; ++i) {
183   - set_irq_chip_and_handler(i, &rawhide_irq_type, handle_level_irq);
  183 + irq_set_chip_and_handler(i, &rawhide_irq_type,
  184 + handle_level_irq);
184 185 irq_set_status_flags(i, IRQ_LEVEL);
185 186 }
186 187  
arch/alpha/kernel/sys_rx164.c
... ... @@ -99,7 +99,7 @@
99 99  
100 100 rx164_update_irq_hw(0);
101 101 for (i = 16; i < 40; ++i) {
102   - set_irq_chip_and_handler(i, &rx164_irq_type, handle_level_irq);
  102 + irq_set_chip_and_handler(i, &rx164_irq_type, handle_level_irq);
103 103 irq_set_status_flags(i, IRQ_LEVEL);
104 104 }
105 105  
arch/alpha/kernel/sys_sable.c
... ... @@ -518,8 +518,8 @@
518 518 long i;
519 519  
520 520 for (i = 0; i < nr_of_irqs; ++i) {
521   - set_irq_chip_and_handler(i, &sable_lynx_irq_type,
522   - handle_level_irq);
  521 + irq_set_chip_and_handler(i, &sable_lynx_irq_type,
  522 + handle_level_irq);
523 523 irq_set_status_flags(i, IRQ_LEVEL);
524 524 }
525 525  
arch/alpha/kernel/sys_takara.c
... ... @@ -138,7 +138,8 @@
138 138 takara_update_irq_hw(i, -1);
139 139  
140 140 for (i = 16; i < 128; ++i) {
141   - set_irq_chip_and_handler(i, &takara_irq_type, handle_level_irq);
  141 + irq_set_chip_and_handler(i, &takara_irq_type,
  142 + handle_level_irq);
142 143 irq_set_status_flags(i, IRQ_LEVEL);
143 144 }
144 145  
arch/alpha/kernel/sys_titan.c
... ... @@ -179,7 +179,7 @@
179 179 {
180 180 long i;
181 181 for (i = imin; i <= imax; ++i) {
182   - set_irq_chip_and_handler(i, ops, handle_level_irq);
  182 + irq_set_chip_and_handler(i, ops, handle_level_irq);
183 183 irq_set_status_flags(i, IRQ_LEVEL);
184 184 }
185 185 }
arch/alpha/kernel/sys_wildfire.c
... ... @@ -183,17 +183,17 @@
183 183 for (i = 0; i < 16; ++i) {
184 184 if (i == 2)
185 185 continue;
186   - set_irq_chip_and_handler(i+irq_bias, &wildfire_irq_type,
187   - handle_level_irq);
  186 + irq_set_chip_and_handler(i + irq_bias, &wildfire_irq_type,
  187 + handle_level_irq);
188 188 irq_set_status_flags(i + irq_bias, IRQ_LEVEL);
189 189 }
190 190  
191   - set_irq_chip_and_handler(36+irq_bias, &wildfire_irq_type,
192   - handle_level_irq);
  191 + irq_set_chip_and_handler(36 + irq_bias, &wildfire_irq_type,
  192 + handle_level_irq);
193 193 irq_set_status_flags(36 + irq_bias, IRQ_LEVEL);
194 194 for (i = 40; i < 64; ++i) {
195   - set_irq_chip_and_handler(i+irq_bias, &wildfire_irq_type,
196   - handle_level_irq);
  195 + irq_set_chip_and_handler(i + irq_bias, &wildfire_irq_type,
  196 + handle_level_irq);
197 197 irq_set_status_flags(i + irq_bias, IRQ_LEVEL);
198 198 }
199 199