commit 1c354fd1d5dd786a19d30ba4e2ae664be8f348ff
Author: Jeff Garzik
Date: Fri Oct 19 16:39:55 2007 -0400

drivers/char/pcmcia/synclink_cs.c: irq handler cleanups

No need to reference 'irq' function arg.

Remove pointless test.

Signed-off-by: Jeff Garzik

drivers/char/pcmcia/synclink_cs.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

1c354fd1d5dd786a19d30ba4e2ae664be8f348ff
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 8caff0c..8f3a123 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -1226,17 +1226,15 @@ static void ri_change(MGSLPC_INFO *info)
* irq interrupt number that caused interrupt
* dev_id device ID supplied during interrupt registration
*/
-static irqreturn_t mgslpc_isr(int irq, void *dev_id)
+static irqreturn_t mgslpc_isr(int dummy, void *dev_id)
{
- MGSLPC_INFO * info = (MGSLPC_INFO *)dev_id;
+ MGSLPC_INFO *info = dev_id;
unsigned short isr;
unsigned char gis, pis;
int count=0;

if (debug_level >= DEBUG_LEVEL_ISR)
- printk("mgslpc_isr(%d) entry.\n", irq);
- if (!info)
- return IRQ_NONE;
+ printk("mgslpc_isr(%d) entry.\n", info->irq_level);

if (!(info->p_dev->_locked))
return IRQ_HANDLED;
@@ -1328,7 +1326,7 @@ static irqreturn_t mgslpc_isr(int irq, void *dev_id)

if (debug_level >= DEBUG_LEVEL_ISR)
printk("%s(%d):mgslpc_isr(%d)exit.\n",
- __FILE__,__LINE__,irq);
+ __FILE__, __LINE__, info->irq_level);

return IRQ_HANDLED;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/