From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754720AbbG0P6u (ORCPT ); Mon, 27 Jul 2015 11:58:50 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36224 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752235AbbG0P6s (ORCPT ); Mon, 27 Jul 2015 11:58:48 -0400 Date: Mon, 27 Jul 2015 08:57:32 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: hpa@zytor.com, Julia.Lawall@lip6.fr, linux-kernel@vger.kernel.org, rmk+kernel@arm.linux.org.uk, mingo@kernel.org, sameo@linux.intel.com, tglx@linutronix.de, lee.jones@linaro.org, jiang.liu@linux.intel.com Reply-To: lee.jones@linaro.org, jiang.liu@linux.intel.com, tglx@linutronix.de, sameo@linux.intel.com, linux-kernel@vger.kernel.org, Julia.Lawall@lip6.fr, hpa@zytor.com, rmk+kernel@arm.linux.org.uk, mingo@kernel.org In-Reply-To: <20150712225929.739294107@linutronix.de> References: <20150712225929.739294107@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] mfd/pm8921: Consolidate chained IRQ handler install/remove Git-Commit-ID: 468fddba892462b47e0ce427f5f9aa0397fa39ff 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: 468fddba892462b47e0ce427f5f9aa0397fa39ff Gitweb: http://git.kernel.org/tip/468fddba892462b47e0ce427f5f9aa0397fa39ff Author: Thomas Gleixner AuthorDate: Mon, 13 Jul 2015 20:44:51 +0000 Committer: Thomas Gleixner CommitDate: Mon, 27 Jul 2015 13:36:38 +0200 mfd/pm8921: 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. 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.739294107@linutronix.de Signed-off-by: Thomas Gleixner --- drivers/mfd/pm8921-core.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c index 5a92646..38b35e5 100644 --- a/drivers/mfd/pm8921-core.c +++ b/drivers/mfd/pm8921-core.c @@ -336,14 +336,12 @@ static int pm8921_probe(struct platform_device *pdev) if (!chip->irqdomain) return -ENODEV; - irq_set_handler_data(irq, chip); - irq_set_chained_handler(irq, pm8xxx_irq_handler); + irq_set_chained_handler_and_data(irq, pm8xxx_irq_handler, chip); irq_set_irq_wake(irq, 1); rc = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); if (rc) { - irq_set_chained_handler(irq, NULL); - irq_set_handler_data(irq, NULL); + irq_set_chained_handler_and_data(irq, NULL, NULL); irq_domain_remove(chip->irqdomain); } @@ -362,8 +360,7 @@ static int pm8921_remove(struct platform_device *pdev) struct pm_irq_chip *chip = platform_get_drvdata(pdev); device_for_each_child(&pdev->dev, NULL, pm8921_remove_child); - irq_set_chained_handler(irq, NULL); - irq_set_handler_data(irq, NULL); + irq_set_chained_handler_and_data(irq, NULL, NULL); irq_domain_remove(chip->irqdomain); return 0;