Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one.
Search and conversion was done with coccinelle: Reported-by: Russell King <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: Julia Lawall <[email protected]> Cc: Samuel Ortiz <[email protected]> Cc: Lee Jones <[email protected]> --- drivers/mfd/htc-egpio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: tip/drivers/mfd/htc-egpio.c =================================================================== --- tip.orig/drivers/mfd/htc-egpio.c +++ tip/drivers/mfd/htc-egpio.c @@ -353,8 +353,8 @@ static int __init egpio_probe(struct pla set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); } 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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
