From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753974AbbG2IRy (ORCPT ); Wed, 29 Jul 2015 04:17:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57098 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753113AbbG2IRw (ORCPT ); Wed, 29 Jul 2015 04:17:52 -0400 Date: Wed, 29 Jul 2015 01:17:35 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: linux-kernel@vger.kernel.org, jiang.liu@linux.intel.com, tglx@linutronix.de, Julia.Lawall@lip6.fr, horms@verge.net.au, magnus.damm@gmail.com, mingo@kernel.org, hpa@zytor.com Reply-To: linux-kernel@vger.kernel.org, horms@verge.net.au, magnus.damm@gmail.com, mingo@kernel.org, hpa@zytor.com, jiang.liu@linux.intel.com, tglx@linutronix.de, Julia.Lawall@lip6.fr In-Reply-To: <20150713151626.872605327@linutronix.de> References: <20150713151626.872605327@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] sh/intc: Prepare irq flow handlers for irq argument removal Git-Commit-ID: c497615c0cb62ba0b06db9580911dcf6d612bdb9 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: c497615c0cb62ba0b06db9580911dcf6d612bdb9 Gitweb: http://git.kernel.org/tip/c497615c0cb62ba0b06db9580911dcf6d612bdb9 Author: Thomas Gleixner AuthorDate: Mon, 13 Jul 2015 20:51:26 +0000 Committer: Ingo Molnar CommitDate: Wed, 29 Jul 2015 10:08:09 +0200 sh/intc: Prepare irq flow handlers for irq argument removal The irq argument of most interrupt flow handlers is unused or merily used instead of a local variable. The handlers which need the irq argument can retrieve the irq number from the irq descriptor. Search and update was done with coccinelle and the invaluable help of Julia Lawall. Signed-off-by: Thomas Gleixner Cc: Jiang Liu Cc: Simon Horman Cc: Magnus Damm Cc: Julia Lawall Link: http://lkml.kernel.org/r/20150713151626.872605327@linutronix.de Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/sh/boards/mach-se/7724/irq.c | 3 ++- drivers/sh/intc/virq.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/sh/boards/mach-se/7724/irq.c b/arch/sh/boards/mach-se/7724/irq.c index 5d1d3ec..9f20338 100644 --- a/arch/sh/boards/mach-se/7724/irq.c +++ b/arch/sh/boards/mach-se/7724/irq.c @@ -92,8 +92,9 @@ static struct irq_chip se7724_irq_chip __read_mostly = { .irq_unmask = enable_se7724_irq, }; -static void se7724_irq_demux(unsigned int irq, struct irq_desc *desc) +static void se7724_irq_demux(unsigned int __irq, struct irq_desc *desc) { + unsigned int irq = irq_desc_get_irq(desc); struct fpga_irq set = get_fpga_irq(irq); unsigned short intv = __raw_readw(set.sraddr); unsigned int ext_irq = set.base; diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c index 503d95a..bafc51c 100644 --- a/drivers/sh/intc/virq.c +++ b/drivers/sh/intc/virq.c @@ -109,8 +109,9 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq) return 0; } -static void intc_virq_handler(unsigned int irq, struct irq_desc *desc) +static void intc_virq_handler(unsigned int __irq, struct irq_desc *desc) { + unsigned int irq = irq_desc_get_irq(desc); struct irq_data *data = irq_desc_get_irq_data(desc); struct irq_chip *chip = irq_data_get_irq_chip(data); struct intc_virq_list *entry, *vlist = irq_data_get_irq_handler_data(data);