[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-c497615c0cb62ba0b06db9580911dcf6d612bdb9@git.kernel.org>
Date: Wed, 29 Jul 2015 01:17:35 -0700
From: tip-bot for Thomas Gleixner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, jiang.liu@...ux.intel.com,
tglx@...utronix.de, Julia.Lawall@...6.fr, horms@...ge.net.au,
magnus.damm@...il.com, mingo@...nel.org, hpa@...or.com
Subject: [tip:irq/core] sh/intc:
Prepare irq flow handlers for irq argument removal
Commit-ID: c497615c0cb62ba0b06db9580911dcf6d612bdb9
Gitweb: http://git.kernel.org/tip/c497615c0cb62ba0b06db9580911dcf6d612bdb9
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Mon, 13 Jul 2015 20:51:26 +0000
Committer: Ingo Molnar <mingo@...nel.org>
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 <tglx@...utronix.de>
Cc: Jiang Liu <jiang.liu@...ux.intel.com>
Cc: Simon Horman <horms@...ge.net.au>
Cc: Magnus Damm <magnus.damm@...il.com>
Cc: Julia Lawall <Julia.Lawall@...6.fr>
Link: http://lkml.kernel.org/r/20150713151626.872605327@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists