From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754600AbbG0P5q (ORCPT ); Mon, 27 Jul 2015 11:57:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36169 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754085AbbG0P5o (ORCPT ); Mon, 27 Jul 2015 11:57:44 -0400 Date: Mon, 27 Jul 2015 08:56:28 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: rmk+kernel@arm.linux.org.uk, Julia.Lawall@lip6.fr, tglx@linutronix.de, mingo@kernel.org, sameo@linux.intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, lee.jones@linaro.org, jiang.liu@linux.intel.com Reply-To: sameo@linux.intel.com, jiang.liu@linux.intel.com, lee.jones@linaro.org, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, Julia.Lawall@lip6.fr, rmk+kernel@arm.linux.org.uk, mingo@kernel.org In-Reply-To: <20150712225929.502560983@linutronix.de> References: <20150712225929.502560983@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] mfd/ezx-pcap: Consolidate chained IRQ handler install/remove Git-Commit-ID: b334e77b0f02c68a137c9e86dc8bf6ba65d7db22 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: b334e77b0f02c68a137c9e86dc8bf6ba65d7db22 Gitweb: http://git.kernel.org/tip/b334e77b0f02c68a137c9e86dc8bf6ba65d7db22 Author: Thomas Gleixner AuthorDate: Mon, 13 Jul 2015 20:44:46 +0000 Committer: Thomas Gleixner CommitDate: Mon, 27 Jul 2015 13:36:37 +0200 mfd/ezx-pcap: 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.502560983@linutronix.de Signed-off-by: Thomas Gleixner --- drivers/mfd/ezx-pcap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index 5991fad..a26a02d 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c @@ -476,8 +476,7 @@ static int ezx_pcap_probe(struct spi_device *spi) pcap->msr = PCAP_MASK_ALL_INTERRUPT; irq_set_irq_type(spi->irq, IRQ_TYPE_EDGE_RISING); - irq_set_handler_data(spi->irq, pcap); - irq_set_chained_handler(spi->irq, pcap_irq_handler); + irq_set_chained_handler_and_data(spi->irq, pcap_irq_handler, pcap); irq_set_irq_wake(spi->irq, 1); /* ADC */