Skip to content

Commit

Permalink
[MIPS] msp_hwbutton.c: minor irq handler cleanups
Browse files Browse the repository at this point in the history
- remove always-true test

- neaten request_irq() indentation

This change's main purpose is to prepare for the patchset in
jgarzik/misc-2.6.git#irq-remove, that explores removal of the
never-used 'irq' argument in each interrupt handler.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Jeff Garzik authored and Ralf Baechle committed May 12, 2008
1 parent a640630 commit 1c9e919
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ static irqreturn_t hwbutton_handler(int irq, void *data)
struct hwbutton_interrupt *hirq = data;
unsigned long cic_ext = *CIC_EXT_CFG_REG;

if (irq != hirq->irq)
return IRQ_NONE;

if (CIC_EXT_IS_ACTIVE_HI(cic_ext, hirq->eirq)) {
/* Interrupt: pin is now HI */
CIC_EXT_SET_ACTIVE_LO(cic_ext, hirq->eirq);
Expand Down Expand Up @@ -164,7 +161,7 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)
*CIC_EXT_CFG_REG = cic_ext;

return request_irq(hirq->irq, hwbutton_handler, IRQF_DISABLED,
hirq->name, (void *)hirq);
hirq->name, hirq);
}

static int __init msp_hwbutton_setup(void)
Expand Down

0 comments on commit 1c9e919

Please sign in to comment.