Home » Mailing list archives » linux-kernel » 2008 » April » 18

[PATCH 12/15] [MIPS] pmc-sierra/msp71xx/msp_hwbutton.c: minor irq handler cleanups

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jeff Garzik <jeff@...>
To: <ralf@...>
Cc: Andrew Morton <akpm@...>, LKML <linux-kernel@...>
Subject: [PATCH 12/15] [MIPS] pmc-sierra/msp71xx/msp_hwbutton.c: minor irq handler cleanups
Date: Friday, April 18, 2008 - 7:23 pm

- 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>
---
 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 ab96a2d..11769b5 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)
-- 
1.5.4.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 7:22 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Russell King, (Sat Apr 19, 4:17 am)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Sat Apr 19, 4:28 am)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Lennert Buytenhek, (Fri Apr 18, 7:29 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 8:25 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Lennert Buytenhek, (Sat Apr 19, 12:14 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Andrew Morton, (Fri Apr 18, 7:44 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 8:21 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Andrew Morton, (Fri Apr 18, 9:17 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Sun Apr 20, 6:17 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Russell King, (Sun Apr 20, 6:40 pm)
Re: [PATCH 01/15] ARM minor irq handler cleanups, Jeff Garzik, (Sun Apr 20, 6:49 pm)
[PATCH 15/15] [INPUT, PCMCIA] avoid use of 'irq' function arg, Jeff Garzik, (Fri Apr 18, 7:23 pm)
[PATCH 14/15] Canonicalize several irq handlers., Jeff Garzik, (Fri Apr 18, 7:23 pm)
[PATCH 13/15] [X86] standard vm86 irq handler, Jeff Garzik, (Fri Apr 18, 7:23 pm)
Re: [PATCH 13/15] [X86] standard vm86 irq handler, Ingo Molnar, (Mon Apr 21, 9:52 am)
[PATCH 12/15] [MIPS] pmc-sierra/msp71xx/msp_hwbutton.c: mino..., Jeff Garzik, (Fri Apr 18, 7:23 pm)
Re: [PATCH 12/15] [MIPS] pmc-sierra/msp71xx/msp_hwbutton.c: ..., Ralf Baechle, (Mon Apr 28, 4:53 pm)
[PATCH 11/15] [RTC] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 7:23 pm)
[PATCH 10/15] [IA64] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 7:22 pm)
[PATCH 09/15] [AVR32] remove unused 'irq' argument from loca..., Jeff Garzik, (Fri Apr 18, 7:22 pm)
[PATCH 08/15] [ISDN] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 7:22 pm)
[PATCH 07/15] [SCSI] aha1542: minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 7:22 pm)
[PATCH 05/15] drivers/char: minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 7:22 pm)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Alan Cox, (Sat Apr 19, 12:16 pm)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Jeff Garzik, (Sun Apr 20, 9:38 pm)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Rogier Wolff, (Sat Apr 19, 2:00 am)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Benjamin Herrenschmidt, (Tue Apr 22, 4:05 am)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Rogier Wolff, (Tue Apr 22, 6:13 am)
Re: [PATCH 05/15] drivers/char: minor irq handler cleanups, Benjamin Herrenschmidt, (Tue Apr 22, 6:46 am)
[PATCH 06/15] [SCSI] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 7:22 pm)
[PATCH 04/15] [PPC] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 7:22 pm)
Re: [PATCH 04/15] [PPC] minor irq handler cleanups, Kumar Gala, (Sat Apr 19, 10:57 am)
[PATCH 03/15] [BLACKFIN] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 7:22 pm)
Re: [PATCH 03/15] [BLACKFIN] minor irq handler cleanups, Bryan Wu, (Mon Apr 21, 11:27 pm)
[PATCH 02/15] [SPARC] minor irq handler cleanups, Jeff Garzik, (Fri Apr 18, 7:22 pm)
Re: [PATCH 02/15] [SPARC] minor irq handler cleanups, David Miller, (Fri Apr 18, 7:33 pm)