From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754786AbbFRMHZ (ORCPT ); Thu, 18 Jun 2015 08:07:25 -0400 Received: from terminus.zytor.com ([198.137.202.10]:59655 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752794AbbFRMHR (ORCPT ); Thu, 18 Jun 2015 08:07:17 -0400 Date: Thu, 18 Jun 2015 05:06:49 -0700 From: tip-bot for Russell King Message-ID: Cc: thierry.reding@gmail.com, mingo@kernel.org, rmk+kernel@arm.linux.org.uk, gnurou@gmail.com, linux-kernel@vger.kernel.org, lee.jones@linaro.org, hpa@zytor.com, tglx@linutronix.de, linus.walleij@linaro.org, jason@lakedaemon.net, ulli.kroll@googlemail.com Reply-To: hpa@zytor.com, linus.walleij@linaro.org, tglx@linutronix.de, ulli.kroll@googlemail.com, jason@lakedaemon.net, rmk+kernel@arm.linux.org.uk, mingo@kernel.org, thierry.reding@gmail.com, gnurou@gmail.com, linux-kernel@vger.kernel.org, lee.jones@linaro.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] ARM: sa1100: convert SA11x0 related code to use new chained handler helper Git-Commit-ID: 056c0acf8798d3b94916633c41432d7a310b2f64 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: 056c0acf8798d3b94916633c41432d7a310b2f64 Gitweb: http://git.kernel.org/tip/056c0acf8798d3b94916633c41432d7a310b2f64 Author: Russell King AuthorDate: Tue, 16 Jun 2015 23:06:25 +0100 Committer: Thomas Gleixner CommitDate: Thu, 18 Jun 2015 14:03:08 +0200 ARM: sa1100: convert SA11x0 related code to use new chained handler helper Convert SA11x0 (Neponset, SA1111, and UCB1x00 code) to use the new irq_set_chained_handler_and_data() helper. Signed-off-by: Russell King Cc: Alexandre Courbot Cc: Hans Ulli Kroll Cc: Jason Cooper Cc: Lee Jones Cc: Linus Walleij Cc: Thierry Reding Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/E1Z4yzx-0002S6-7p@rmk-PC.arm.linux.org.uk Signed-off-by: Thomas Gleixner --- arch/arm/common/sa1111.c | 7 +++---- arch/arm/mach-sa1100/neponset.c | 3 +-- drivers/mfd/ucb1x00-core.c | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 5cc779c..93ee70d 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -501,8 +501,8 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base) * Register SA1111 interrupt */ irq_set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING); - irq_set_handler_data(sachip->irq, sachip); - irq_set_chained_handler(sachip->irq, sa1111_irq_handler); + irq_set_chained_handler_and_data(sachip->irq, sa1111_irq_handler, + sachip); dev_info(sachip->dev, "Providing IRQ%u-%u\n", sachip->irq_base, sachip->irq_base + SA1111_IRQ_NR - 1); @@ -836,8 +836,7 @@ static void __sa1111_remove(struct sa1111 *sachip) clk_unprepare(sachip->clk); if (sachip->irq != NO_IRQ) { - irq_set_chained_handler(sachip->irq, NULL); - irq_set_handler_data(sachip->irq, NULL); + irq_set_chained_handler_and_data(sachip->irq, NULL, NULL); irq_free_descs(sachip->irq_base, SA1111_IRQ_NR); release_mem_region(sachip->phys + SA1111_INTC, 512); diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c index af868d25..99d9a3b 100644 --- a/arch/arm/mach-sa1100/neponset.c +++ b/arch/arm/mach-sa1100/neponset.c @@ -327,8 +327,7 @@ static int neponset_probe(struct platform_device *dev) irq_set_chip(d->irq_base + NEP_IRQ_SA1111, &nochip); irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING); - irq_set_handler_data(irq, d); - irq_set_chained_handler(irq, neponset_irq_handler); + irq_set_chained_handler_and_data(irq, neponset_irq_handler, d); /* * We would set IRQ_GPIO25 to be a wake-up IRQ, but unfortunately diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 58ea9fd..3591550 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c @@ -566,8 +566,7 @@ static int ucb1x00_probe(struct mcp *mcp) } irq_set_irq_type(ucb->irq, IRQ_TYPE_EDGE_RISING); - irq_set_handler_data(ucb->irq, ucb); - irq_set_chained_handler(ucb->irq, ucb1x00_irq); + irq_set_chained_handler_and_data(ucb->irq, ucb1x00_irq, ucb); if (pdata && pdata->gpio_base) { ucb->gpio.label = dev_name(&ucb->dev);