diff options
Diffstat (limited to 'kernel/drivers/mfd/htc-egpio.c')
| -rw-r--r-- | kernel/drivers/mfd/htc-egpio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/drivers/mfd/htc-egpio.c b/kernel/drivers/mfd/htc-egpio.c index 49f39feca..6ccaf90d9 100644 --- a/kernel/drivers/mfd/htc-egpio.c +++ b/kernel/drivers/mfd/htc-egpio.c @@ -98,7 +98,7 @@ static struct irq_chip egpio_muxed_chip = { .irq_unmask = egpio_unmask, }; -static void egpio_handler(unsigned int irq, struct irq_desc *desc) +static void egpio_handler(struct irq_desc *desc) { struct egpio_info *ei = irq_desc_get_handler_data(desc); int irqpin; @@ -350,11 +350,11 @@ static int __init egpio_probe(struct platform_device *pdev) irq_set_chip_and_handler(irq, &egpio_muxed_chip, handle_simple_irq); irq_set_chip_data(irq, ei); - set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); + irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE); } irq_set_irq_type(ei->chained_irq, IRQ_TYPE_EDGE_RISING); - irq_set_handler_data(ei->chained_irq, ei); - irq_set_chained_handler(ei->chained_irq, egpio_handler); + irq_set_chained_handler_and_data(ei->chained_irq, + egpio_handler, ei); ack_irqs(ei); device_init_wakeup(&pdev->dev, 1); @@ -376,7 +376,7 @@ static int __exit egpio_remove(struct platform_device *pdev) irq_end = ei->irq_start + ei->nirqs; for (irq = ei->irq_start; irq < irq_end; irq++) { irq_set_chip_and_handler(irq, NULL, NULL); - set_irq_flags(irq, 0); + irq_set_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE); } irq_set_chained_handler(ei->chained_irq, NULL); device_init_wakeup(&pdev->dev, 0); |