From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754587AbbG0P4r (ORCPT ); Mon, 27 Jul 2015 11:56:47 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36140 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753537AbbG0P4q (ORCPT ); Mon, 27 Jul 2015 11:56:46 -0400 Date: Mon, 27 Jul 2015 08:55:33 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: mingo@kernel.org, a-jacquiot@ti.com, rmk+kernel@arm.linux.org.uk, hpa@zytor.com, Julia.Lawall@lip6.fr, msalter@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, msalter@redhat.com, tglx@linutronix.de, rmk+kernel@arm.linux.org.uk, Julia.Lawall@lip6.fr, hpa@zytor.com, mingo@kernel.org, a-jacquiot@ti.com In-Reply-To: <20150713130429.697731509@linutronix.de> References: <20150713130429.697731509@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] C6X/meagmod-pic: Consolidate chained IRQ handler install/remove Git-Commit-ID: bdf76e36765970c64624d32150b656dc6669ddc2 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: bdf76e36765970c64624d32150b656dc6669ddc2 Gitweb: http://git.kernel.org/tip/bdf76e36765970c64624d32150b656dc6669ddc2 Author: Thomas Gleixner AuthorDate: Mon, 13 Jul 2015 20:38:38 +0000 Committer: Thomas Gleixner CommitDate: Mon, 27 Jul 2015 13:36:37 +0200 C6X/meagmod-pic: 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: Mark Salter Cc: Aurelien Jacquiot Cc: linux-c6x-dev@linux-c6x.org Cc: Julia Lawall Link: http://lkml.kernel.org/r/20150713130429.697731509@linutronix.de Signed-off-by: Thomas Gleixner --- arch/c6x/platforms/megamod-pic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/c6x/platforms/megamod-pic.c b/arch/c6x/platforms/megamod-pic.c index 74e3371..349bc01 100644 --- a/arch/c6x/platforms/megamod-pic.c +++ b/arch/c6x/platforms/megamod-pic.c @@ -282,8 +282,8 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np) soc_writel(~0, &pic->regs->evtmask[i]); soc_writel(~0, &pic->regs->evtclr[i]); - irq_set_handler_data(irq, &cascade_data[i]); - irq_set_chained_handler(irq, megamod_irq_cascade); + irq_set_chained_handler_and_data(irq, megamod_irq_cascade, + &cascade_data[i]); } /* Finally, set up the MUX registers */