From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754623AbbG0P6H (ORCPT ); Mon, 27 Jul 2015 11:58:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36181 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754074AbbG0P6F (ORCPT ); Mon, 27 Jul 2015 11:58:05 -0400 Date: Mon, 27 Jul 2015 08:57:49 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: Julia.Lawall@lip6.fr, lee.jones@linaro.org, mingo@kernel.org, rmk+kernel@arm.linux.org.uk, sameo@linux.intel.com, tglx@linutronix.de, jiang.liu@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: Julia.Lawall@lip6.fr, lee.jones@linaro.org, mingo@kernel.org, rmk+kernel@arm.linux.org.uk, sameo@linux.intel.com, tglx@linutronix.de, jiang.liu@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org In-Reply-To: <20150712225929.823376331@linutronix.de> References: <20150712225929.823376331@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] mfd/t7l66xb: Consolidate chained IRQ handler install/remove Git-Commit-ID: 71dfb90cd61ea37ef470204f32e941f7c6754de8 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: 71dfb90cd61ea37ef470204f32e941f7c6754de8 Gitweb: http://git.kernel.org/tip/71dfb90cd61ea37ef470204f32e941f7c6754de8 Author: Thomas Gleixner AuthorDate: Mon, 13 Jul 2015 20:44:52 +0000 Committer: Thomas Gleixner CommitDate: Mon, 27 Jul 2015 13:36:38 +0200 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 Cc: Jiang Liu Cc: Lee Jones Cc: Samuel Ortiz Cc: Julia Lawall Link: http://lkml.kernel.org/r/20150712225929.823376331@linutronix.de Signed-off-by: Thomas Gleixner --- drivers/mfd/t7l66xb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index c09fb5dc..8ad48dd 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c @@ -252,8 +252,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) @@ -263,8 +262,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++) { #ifdef CONFIG_ARM