From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753341AbbGMU6j (ORCPT ); Mon, 13 Jul 2015 16:58:39 -0400 Received: from www.linutronix.de ([62.245.132.108]:55921 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753550AbbGMUpA (ORCPT ); Mon, 13 Jul 2015 16:45:00 -0400 Message-Id: <20150712225929.823376331@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 13 Jul 2015 20:44:52 -0000 From: Thomas Gleixner To: LKML Cc: Jiang Liu , Lee Jones , Samuel Ortiz , Russell King , Julia Lawall Subject: [patch 5/9] mfd/t7l66xb: Consolidate chained IRQ handler install/remove References: <20150712225758.573960291@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=mfd-t7l66xb-Consolidate-chained-IRQ-handler-install-.patch X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001,URIBL_BLOCKED=0.001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Julia Lawall Cc: Samuel Ortiz Cc: Lee Jones --- drivers/mfd/t7l66xb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Index: tip/drivers/mfd/t7l66xb.c =================================================================== --- tip.orig/drivers/mfd/t7l66xb.c +++ tip/drivers/mfd/t7l66xb.c @@ -252,8 +252,7 @@ static void t7l66xb_attach_irq(struct pl } 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) @@ -263,8 +262,7 @@ static void t7l66xb_detach_irq(struct pl 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++) { #ifdef CONFIG_ARM