diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-04-18 19:23:01 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-05-12 16:46:52 +0100 |
| commit | 1c9e919f48a49fda2ff2c607891cc17024e75122 (patch) | |
| tree | bcd76fc9ca5def3babe2ba6fe2ae6fea3e1a3dba /arch/mips/pmc-sierra | |
| parent | a64063046026729a69ad06c94453f4ddaa562d60 (diff) | |
| download | kernel_samsung_smdk4412-1c9e919f48a49fda2ff2c607891cc17024e75122.tar.gz kernel_samsung_smdk4412-1c9e919f48a49fda2ff2c607891cc17024e75122.tar.bz2 kernel_samsung_smdk4412-1c9e919f48a49fda2ff2c607891cc17024e75122.zip | |
[MIPS] msp_hwbutton.c: minor irq handler cleanups
- 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>
Diffstat (limited to 'arch/mips/pmc-sierra')
| -rw-r--r-- | arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c index ab96a2d7f4c..11769b55438 100644 --- a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c +++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c @@ -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); @@ -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) |