From patchwork Mon Jul 13 20:47:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 494739 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 B0FE61402E2 for ; Tue, 14 Jul 2015 06:56:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932065AbbGMU4h (ORCPT ); Mon, 13 Jul 2015 16:56:37 -0400 Received: from www.linutronix.de ([62.245.132.108]:56055 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753355AbbGMUrm (ORCPT ); Mon, 13 Jul 2015 16:47:42 -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 1ZEkdZ-0006Z3-GZ; Mon, 13 Jul 2015 22:47:41 +0200 Message-Id: <20150713072814.334902056@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 13 Jul 2015 20:47:34 -0000 From: Thomas Gleixner To: LKML Cc: Linus Walleij , linux-gpio@vger.kernel.org, Jiang Liu , Russell King , Julia Lawall Subject: [patch 01/22] pinctrl/rockchip: Consolidate chained IRQ handler install/remove References: <20150713072703.919712512@linutronix.de> MIME-Version: 1.0 Content-Disposition: inline; filename=pinctrl-rockchip-Consolidate-chained-IRQ-handler-ins.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: linux-gpio@vger.kernel.org --- drivers/pinctrl/pinctrl-rockchip.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/pinctrl/pinctrl-rockchip.c =================================================================== --- tip.orig/drivers/pinctrl/pinctrl-rockchip.c +++ tip/drivers/pinctrl/pinctrl-rockchip.c @@ -1689,8 +1689,8 @@ static int rockchip_interrupts_register( gc->chip_types[0].chip.irq_set_type = rockchip_irq_set_type; gc->wake_enabled = IRQ_MSK(bank->nr_pins); - irq_set_handler_data(bank->irq, bank); - irq_set_chained_handler(bank->irq, rockchip_irq_demux); + irq_set_chained_handler_and_data(bank->irq, + rockchip_irq_demux, bank); } return 0;