From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754640AbbG0P60 (ORCPT ); Mon, 27 Jul 2015 11:58:26 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36195 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753545AbbG0P6Y (ORCPT ); Mon, 27 Jul 2015 11:58:24 -0400 Date: Mon, 27 Jul 2015 08:58:07 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: tglx@linutronix.de, lee.jones@linaro.org, sameo@linux.intel.com, jiang.liu@linux.intel.com, hpa@zytor.com, Julia.Lawall@lip6.fr, linux-kernel@vger.kernel.org, mingo@kernel.org, rmk+kernel@arm.linux.org.uk Reply-To: jiang.liu@linux.intel.com, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, Julia.Lawall@lip6.fr, rmk+kernel@arm.linux.org.uk, sameo@linux.intel.com, tglx@linutronix.de, lee.jones@linaro.org In-Reply-To: <20150712225929.902434148@linutronix.de> References: <20150712225929.902434148@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] mfd/tc6393xb: Consolidate chained IRQ handler install/remove Git-Commit-ID: e66cf89a3341f85ac73110aec31c5b8cc8dd7a0d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e66cf89a3341f85ac73110aec31c5b8cc8dd7a0d Gitweb: http://git.kernel.org/tip/e66cf89a3341f85ac73110aec31c5b8cc8dd7a0d Author: Thomas Gleixner AuthorDate: Mon, 13 Jul 2015 20:44:54 +0000 Committer: Thomas Gleixner CommitDate: Mon, 27 Jul 2015 13:36:38 +0200 mfd/tc6393xb: 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 Cc: Jiang Liu Cc: Lee Jones Cc: Samuel Ortiz Cc: Julia Lawall Link: http://lkml.kernel.org/r/20150712225929.902434148@linutronix.de Signed-off-by: Thomas Gleixner --- drivers/mfd/tc6393xb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c index 63458b3..6288383 100644 --- a/drivers/mfd/tc6393xb.c +++ b/drivers/mfd/tc6393xb.c @@ -590,8 +590,8 @@ static void tc6393xb_attach_irq(struct platform_device *dev) } irq_set_irq_type(tc6393xb->irq, IRQ_TYPE_EDGE_FALLING); - irq_set_handler_data(tc6393xb->irq, tc6393xb); - irq_set_chained_handler(tc6393xb->irq, tc6393xb_irq); + irq_set_chained_handler_and_data(tc6393xb->irq, tc6393xb_irq, + tc6393xb); } static void tc6393xb_detach_irq(struct platform_device *dev) @@ -599,8 +599,7 @@ static void tc6393xb_detach_irq(struct platform_device *dev) struct tc6393xb *tc6393xb = platform_get_drvdata(dev); unsigned int irq, irq_base; - irq_set_chained_handler(tc6393xb->irq, NULL); - irq_set_handler_data(tc6393xb->irq, NULL); + irq_set_chained_handler_and_data(tc6393xb->irq, NULL, NULL); irq_base = tc6393xb->irq_base;