Skip to content

Commit

Permalink
ARM/pxa: Prepare *_irq_handler for irq argument removal
Browse files Browse the repository at this point in the history
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 <linux+kernel@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
  • Loading branch information
Thomas Gleixner committed Jul 13, 2015
1 parent 1c2d4af commit 6947d04
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion arch/arm/mach-pxa/cm-x2xx-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-pxa/lpd270.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-pxa/pcm990-baseboard.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-pxa/viper.c
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,9 @@ static inline unsigned long viper_irq_pending(void)
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();
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mach-pxa/zeus.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,9 @@ static inline unsigned long zeus_irq_pending(void)
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();
Expand Down

0 comments on commit 6947d04

Please sign in to comment.