Commit d6f7ce9f7fde069424e6400c31717ef34aab7e5f
Committed by
Samuel Ortiz
Samuel Ortiz
1 parent
d5bb122165
mfd: Fold irq_set_chip/irq_set_handler
Use the combined irq_set_chip_and_handler() function instead. Converted with coccinelle. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Showing 5 changed files with 8 additions and 12 deletions Side-by-side Diff
drivers/mfd/asic3.c
| ... | ... | @@ -416,8 +416,7 @@ |
| 416 | 416 | |
| 417 | 417 | for (irq = irq_base; irq < irq_base + ASIC3_NR_IRQS; irq++) { |
| 418 | 418 | set_irq_flags(irq, 0); |
| 419 | - irq_set_handler(irq, NULL); | |
| 420 | - irq_set_chip(irq, NULL); | |
| 419 | + irq_set_chip_and_handler(irq, NULL, NULL); | |
| 421 | 420 | irq_set_chip_data(irq, NULL); |
| 422 | 421 | } |
| 423 | 422 | irq_set_chained_handler(asic->irq_nr, NULL); |
drivers/mfd/htc-egpio.c
| ... | ... | @@ -344,9 +344,9 @@ |
| 344 | 344 | ei->ack_write = 0; |
| 345 | 345 | irq_end = ei->irq_start + ei->nirqs; |
| 346 | 346 | for (irq = ei->irq_start; irq < irq_end; irq++) { |
| 347 | - irq_set_chip(irq, &egpio_muxed_chip); | |
| 347 | + irq_set_chip_and_handler(irq, &egpio_muxed_chip, | |
| 348 | + handle_simple_irq); | |
| 348 | 349 | irq_set_chip_data(irq, ei); |
| 349 | - irq_set_handler(irq, handle_simple_irq); | |
| 350 | 350 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
| 351 | 351 | } |
| 352 | 352 | irq_set_irq_type(ei->chained_irq, IRQ_TYPE_EDGE_RISING); |
| ... | ... | @@ -373,8 +373,7 @@ |
| 373 | 373 | if (ei->chained_irq) { |
| 374 | 374 | irq_end = ei->irq_start + ei->nirqs; |
| 375 | 375 | for (irq = ei->irq_start; irq < irq_end; irq++) { |
| 376 | - irq_set_chip(irq, NULL); | |
| 377 | - irq_set_handler(irq, NULL); | |
| 376 | + irq_set_chip_and_handler(irq, NULL, NULL); | |
| 378 | 377 | set_irq_flags(irq, 0); |
| 379 | 378 | } |
| 380 | 379 | irq_set_chained_handler(ei->chained_irq, NULL); |
drivers/mfd/htc-i2cpld.c
| ... | ... | @@ -348,9 +348,9 @@ |
| 348 | 348 | /* Setup irq handlers */ |
| 349 | 349 | irq_end = chip->irq_start + chip->nirqs; |
| 350 | 350 | for (irq = chip->irq_start; irq < irq_end; irq++) { |
| 351 | - irq_set_chip(irq, &htcpld_muxed_chip); | |
| 351 | + irq_set_chip_and_handler(irq, &htcpld_muxed_chip, | |
| 352 | + handle_simple_irq); | |
| 352 | 353 | irq_set_chip_data(irq, chip); |
| 353 | - irq_set_handler(irq, handle_simple_irq); | |
| 354 | 354 | #ifdef CONFIG_ARM |
| 355 | 355 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
| 356 | 356 | #else |
drivers/mfd/t7l66xb.c
| ... | ... | @@ -243,9 +243,8 @@ |
| 243 | 243 | irq_base = t7l66xb->irq_base; |
| 244 | 244 | |
| 245 | 245 | for (irq = irq_base; irq < irq_base + T7L66XB_NR_IRQS; irq++) { |
| 246 | - irq_set_chip(irq, &t7l66xb_chip); | |
| 246 | + irq_set_chip_and_handler(irq, &t7l66xb_chip, handle_level_irq); | |
| 247 | 247 | irq_set_chip_data(irq, t7l66xb); |
| 248 | - irq_set_handler(irq, handle_level_irq); | |
| 249 | 248 | #ifdef CONFIG_ARM |
| 250 | 249 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
| 251 | 250 | #endif |
drivers/mfd/tc6393xb.c
| ... | ... | @@ -572,9 +572,8 @@ |
| 572 | 572 | irq_base = tc6393xb->irq_base; |
| 573 | 573 | |
| 574 | 574 | for (irq = irq_base; irq < irq_base + TC6393XB_NR_IRQS; irq++) { |
| 575 | - irq_set_chip(irq, &tc6393xb_chip); | |
| 575 | + irq_set_chip_and_handler(irq, &tc6393xb_chip, handle_edge_irq); | |
| 576 | 576 | irq_set_chip_data(irq, tc6393xb); |
| 577 | - irq_set_handler(irq, handle_edge_irq); | |
| 578 | 577 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
| 579 | 578 | } |
| 580 | 579 |