diff options
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/asic3.c | 3 | ||||
| -rw-r--r-- | drivers/mfd/htc-egpio.c | 7 | ||||
| -rw-r--r-- | drivers/mfd/htc-i2cpld.c | 4 | ||||
| -rw-r--r-- | drivers/mfd/t7l66xb.c | 3 | ||||
| -rw-r--r-- | drivers/mfd/tc6393xb.c | 3 |
5 files changed, 8 insertions, 12 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index 22b5a78bbfdb..d4a851c6b5bf 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c @@ -416,8 +416,7 @@ static void asic3_irq_remove(struct platform_device *pdev) for (irq = irq_base; irq < irq_base + ASIC3_NR_IRQS; irq++) { set_irq_flags(irq, 0); - irq_set_handler(irq, NULL); - irq_set_chip(irq, NULL); + irq_set_chip_and_handler(irq, NULL, NULL); irq_set_chip_data(irq, NULL); } irq_set_chained_handler(asic->irq_nr, NULL); diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c index fcd89e604ab1..bbaec0ccba8f 100644 --- a/drivers/mfd/htc-egpio.c +++ b/drivers/mfd/htc-egpio.c @@ -344,9 +344,9 @@ static int __init egpio_probe(struct platform_device *pdev) ei->ack_write = 0; irq_end = ei->irq_start + ei->nirqs; for (irq = ei->irq_start; irq < irq_end; irq++) { - irq_set_chip(irq, &egpio_muxed_chip); + irq_set_chip_and_handler(irq, &egpio_muxed_chip, + handle_simple_irq); irq_set_chip_data(irq, ei); - irq_set_handler(irq, handle_simple_irq); set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); } irq_set_irq_type(ei->chained_irq, IRQ_TYPE_EDGE_RISING); @@ -373,8 +373,7 @@ static int __exit egpio_remove(struct platform_device *pdev) if (ei->chained_irq) { irq_end = ei->irq_start + ei->nirqs; for (irq = ei->irq_start; irq < irq_end; irq++) { - irq_set_chip(irq, NULL); - irq_set_handler(irq, NULL); + irq_set_chip_and_handler(irq, NULL, NULL); set_irq_flags(irq, 0); } irq_set_chained_handler(ei->chained_irq, NULL); diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c index 9ba2a2a15dcb..d55065cc324c 100644 --- a/drivers/mfd/htc-i2cpld.c +++ b/drivers/mfd/htc-i2cpld.c @@ -348,9 +348,9 @@ static int __devinit htcpld_setup_chip_irq( /* Setup irq handlers */ irq_end = chip->irq_start + chip->nirqs; for (irq = chip->irq_start; irq < irq_end; irq++) { - irq_set_chip(irq, &htcpld_muxed_chip); + irq_set_chip_and_handler(irq, &htcpld_muxed_chip, + handle_simple_irq); irq_set_chip_data(irq, chip); - irq_set_handler(irq, handle_simple_irq); #ifdef CONFIG_ARM set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); #else diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index 2e1fca4715ed..42830e692964 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c @@ -243,9 +243,8 @@ static void t7l66xb_attach_irq(struct platform_device *dev) irq_base = t7l66xb->irq_base; for (irq = irq_base; irq < irq_base + T7L66XB_NR_IRQS; irq++) { - irq_set_chip(irq, &t7l66xb_chip); + irq_set_chip_and_handler(irq, &t7l66xb_chip, handle_level_irq); irq_set_chip_data(irq, t7l66xb); - irq_set_handler(irq, handle_level_irq); #ifdef CONFIG_ARM set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); #endif diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c index 06112c8628bf..fc53ce287601 100644 --- a/drivers/mfd/tc6393xb.c +++ b/drivers/mfd/tc6393xb.c @@ -572,9 +572,8 @@ static void tc6393xb_attach_irq(struct platform_device *dev) irq_base = tc6393xb->irq_base; for (irq = irq_base; irq < irq_base + TC6393XB_NR_IRQS; irq++) { - irq_set_chip(irq, &tc6393xb_chip); + irq_set_chip_and_handler(irq, &tc6393xb_chip, handle_edge_irq); irq_set_chip_data(irq, tc6393xb); - irq_set_handler(irq, handle_edge_irq); set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); } |