From: tglx@linutronix.de (Thomas Gleixner)
To: linux-arm-kernel@lists.infradead.org
Subject: [patch 09/11] ARM/pxa: Prepare *_irq_handler for irq argument removal
Date: Mon, 13 Jul 2015 20:29:12 -0000 [thread overview]
Message-ID: <20150713090936.677065400@linutronix.de> (raw)
In-Reply-To: 20150713090726.316699641@linutronix.de
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@linutronix.de>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: linux-arm-kernel at lists.infradead.org
---
arch/arm/mach-pxa/cm-x2xx-pci.c | 3 ++-
arch/arm/mach-pxa/lpd270.c | 3 ++-
arch/arm/mach-pxa/pcm990-baseboard.c | 3 ++-
arch/arm/mach-pxa/viper.c | 3 ++-
arch/arm/mach-pxa/zeus.c | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
Index: tip/arch/arm/mach-pxa/cm-x2xx-pci.c
===================================================================
--- tip.orig/arch/arm/mach-pxa/cm-x2xx-pci.c
+++ tip/arch/arm/mach-pxa/cm-x2xx-pci.c
@@ -29,8 +29,9 @@
void __iomem *it8152_base_address;
static int cmx2xx_it8152_irq_gpio;
-static void cmx2xx_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void cmx2xx_it8152_irq_demux(unsigned int __irq, struct irq_desc *desc)
{
+ unsigned int irq = irq_desc_get_irq(desc);
/* clear our parent irq */
desc->irq_data.chip->irq_ack(&desc->irq_data);
Index: tip/arch/arm/mach-pxa/lpd270.c
===================================================================
--- tip.orig/arch/arm/mach-pxa/lpd270.c
+++ tip/arch/arm/mach-pxa/lpd270.c
@@ -120,8 +120,9 @@ static struct irq_chip lpd270_irq_chip =
.irq_unmask = lpd270_unmask_irq,
};
-static void lpd270_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void lpd270_irq_handler(unsigned int __irq, struct irq_desc *desc)
{
+ unsigned int irq;
unsigned long pending;
pending = __raw_readw(LPD270_INT_STATUS) & lpd270_irq_enabled;
Index: tip/arch/arm/mach-pxa/pcm990-baseboard.c
===================================================================
--- tip.orig/arch/arm/mach-pxa/pcm990-baseboard.c
+++ tip/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -284,8 +284,9 @@ static struct irq_chip pcm990_irq_chip =
.irq_unmask = pcm990_unmask_irq,
};
-static void pcm990_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void pcm990_irq_handler(unsigned int __irq, struct irq_desc *desc)
{
+ unsigned int irq;
unsigned long pending;
pending = ~pcm990_cpld_readb(PCM990_CTRL_INTSETCLR);
Index: tip/arch/arm/mach-pxa/viper.c
===================================================================
--- tip.orig/arch/arm/mach-pxa/viper.c
+++ tip/arch/arm/mach-pxa/viper.c
@@ -276,8 +276,9 @@ static inline unsigned long viper_irq_pe
viper_irq_enabled_mask;
}
-static void viper_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void viper_irq_handler(unsigned int __irq, struct irq_desc *desc)
{
+ unsigned int irq;
unsigned long pending;
pending = viper_irq_pending();
Index: tip/arch/arm/mach-pxa/zeus.c
===================================================================
--- tip.orig/arch/arm/mach-pxa/zeus.c
+++ tip/arch/arm/mach-pxa/zeus.c
@@ -105,8 +105,9 @@ static inline unsigned long zeus_irq_pen
return __raw_readw(ZEUS_CPLD_ISA_IRQ) & zeus_irq_enabled_mask;
}
-static void zeus_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void zeus_irq_handler(unsigned int __irq, struct irq_desc *desc)
{
+ unsigned int irq;
unsigned long pending;
pending = zeus_irq_pending();
next prev parent reply other threads:[~2015-07-13 20:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-13 20:28 [patch 00/11] ARM: Interrupt cleanups and API change preparation Thomas Gleixner
2015-07-13 20:29 ` [patch 01/11] ARM/orion: Consolidate chained IRQ handler install/remove Thomas Gleixner
2015-07-13 20:29 ` [patch 02/11] ARM/locomo: " Thomas Gleixner
2015-07-13 20:29 ` [patch 03/11] ARM/irq: Use access helper irq_data_get_affinity_mask() Thomas Gleixner
2015-07-13 20:29 ` [patch 04/11] ARM/LPC32xx: Use irq_set_handler_locked() Thomas Gleixner
2015-07-13 20:29 ` [patch 05/11] ARM, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc Thomas Gleixner
2015-07-13 20:29 ` [patch 06/11] ARM/locomo: Prepare locomo_handler for irq argument removal Thomas Gleixner
2015-07-13 20:29 ` [patch 07/11] ARM/sa1111: Prepare sa1111_irq_handler " Thomas Gleixner
2015-07-13 20:29 ` [patch 08/11] ARM/dove: Prepare pmu_irq_handler " Thomas Gleixner
2015-07-13 20:29 ` Thomas Gleixner [this message]
2015-07-13 20:29 ` [patch 10/11] ARM/pxa: Prepare balloon3_irq_handler " Thomas Gleixner
2015-07-13 20:29 ` [patch 11/11] ARM/orion/gpio: Prepare gpio_irq_handler " Thomas Gleixner
2015-08-05 15:26 ` [patch 00/11] ARM: Interrupt cleanups and API change preparation Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150713090936.677065400@linutronix.de \
--to=tglx@linutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.