From patchwork Mon Jul 13 20:41:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 494753 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7CA8A140293 for ; Tue, 14 Jul 2015 07:01:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753464AbbGMUld (ORCPT ); Mon, 13 Jul 2015 16:41:33 -0400 Received: from www.linutronix.de ([62.245.132.108]:55741 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753461AbbGMUlb (ORCPT ); Mon, 13 Jul 2015 16:41:31 -0400 Received: from localhost ([127.0.0.1] helo=[127.0.1.1]) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1ZEkXZ-0006Kk-9B; Mon, 13 Jul 2015 22:41:29 +0200 Message-Id: <20150712232405.127041870@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 13 Jul 2015 20:41:22 -0000 From: Thomas Gleixner To: LKML Cc: Linus Walleij , Alexandre Courbot , linux-gpio@vger.kernel.org, Jiang Liu , Russell King , Julia Lawall Subject: [patch 05/19] gpiolib: Consolidate chained IRQ handler install/remove References: <20150712232317.244138485@linutronix.de> MIME-Version: 1.0 Content-Disposition: inline; filename=gpiolib-Consolidate-chained-IRQ-handler-install-remo.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-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@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: Linus Walleij Cc: Alexandre Courbot Cc: linux-gpio@vger.kernel.org --- drivers/gpio/gpiolib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: tip/drivers/gpio/gpiolib.c =================================================================== --- tip.orig/drivers/gpio/gpiolib.c +++ tip/drivers/gpio/gpiolib.c @@ -443,8 +443,8 @@ void gpiochip_set_chained_irqchip(struct * The parent irqchip is already using the chip_data for this * irqchip, so our callbacks simply use the handler_data. */ - irq_set_handler_data(parent_irq, gpiochip); - irq_set_chained_handler(parent_irq, parent_handler); + irq_set_chained_handler_and_data(parent_irq, parent_handler, + gpiochip); gpiochip->irq_parent = parent_irq; }