From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751194AbbJAOgy (ORCPT ); Thu, 1 Oct 2015 10:36:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54137 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752966AbbJAOgv (ORCPT ); Thu, 1 Oct 2015 10:36:51 -0400 Date: Thu, 1 Oct 2015 07:36:29 -0700 From: tip-bot for Axel Lin Message-ID: Cc: axel.lin@ingics.com, jason@lakedaemon.net, tglx@linutronix.de, hpa@zytor.com, marc.zyngier@arm.com, ralf@linux-mips.org, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: axel.lin@ingics.com, jason@lakedaemon.net, hpa@zytor.com, tglx@linutronix.de, marc.zyngier@arm.com, ralf@linux-mips.org, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <1443709604.12993.0.camel@ingics.com> References: <1443709604.12993.0.camel@ingics.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/i8259: Convert to use irq_set_chained_handler_and_data Git-Commit-ID: a51e80d002b63bbdaff3229f3ebf4fbb53c75c33 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: a51e80d002b63bbdaff3229f3ebf4fbb53c75c33 Gitweb: http://git.kernel.org/tip/a51e80d002b63bbdaff3229f3ebf4fbb53c75c33 Author: Axel Lin AuthorDate: Thu, 1 Oct 2015 22:26:44 +0800 Committer: Thomas Gleixner CommitDate: Thu, 1 Oct 2015 16:32:54 +0200 irqchip/i8259: Convert to use irq_set_chained_handler_and_data 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. Signed-off-by: Axel Lin Cc: Ralf Baechle Cc: Jason Cooper Cc: Marc Zyngier Link: http://lkml.kernel.org/r/1443709604.12993.0.camel@ingics.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-i8259.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-i8259.c b/drivers/irqchip/irq-i8259.c index e484fd2..6b304eb 100644 --- a/drivers/irqchip/irq-i8259.c +++ b/drivers/irqchip/irq-i8259.c @@ -377,8 +377,8 @@ int __init i8259_of_init(struct device_node *node, struct device_node *parent) } domain = __init_i8259_irqs(node); - irq_set_handler_data(parent_irq, domain); - irq_set_chained_handler(parent_irq, i8259_irq_dispatch); + irq_set_chained_handler_and_data(parent_irq, i8259_irq_dispatch, + domain); return 0; } IRQCHIP_DECLARE(i8259, "intel,i8259", i8259_of_init);