From: Thomas Gleixner Date: Mon, 13 Jul 2015 20:44:52 +0000 (+0000) Subject: mfd: t7l66xb: Consolidate chained IRQ handler install/remove X-Git-Tag: v4.14-rc1~4760^2~23 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de7c9e0da9ca5962ed562296eaa521e5cc492322;p=platform%2Fkernel%2Flinux-rpi.git mfd: t7l66xb: Consolidate chained IRQ handler install/remove 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 Signed-off-by: Thomas Gleixner Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index 96d8298..cc281032 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c @@ -249,8 +249,7 @@ static void t7l66xb_attach_irq(struct platform_device *dev) } irq_set_irq_type(t7l66xb->irq, IRQ_TYPE_EDGE_FALLING); - irq_set_handler_data(t7l66xb->irq, t7l66xb); - irq_set_chained_handler(t7l66xb->irq, t7l66xb_irq); + irq_set_chained_handler_and_data(t7l66xb->irq, t7l66xb_irq, t7l66xb); } static void t7l66xb_detach_irq(struct platform_device *dev) @@ -260,8 +259,7 @@ static void t7l66xb_detach_irq(struct platform_device *dev) irq_base = t7l66xb->irq_base; - irq_set_chained_handler(t7l66xb->irq, NULL); - irq_set_handler_data(t7l66xb->irq, NULL); + irq_set_chained_handler_and_data(t7l66xb->irq, NULL, NULL); for (irq = irq_base; irq < irq_base + T7L66XB_NR_IRQS; irq++) { irq_set_chip(irq, NULL);