diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-31 10:20:49 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-21 01:03:43 +0200 |
| commit | a6f97b293b08877d945ea3f28926aa446dd7ca2e (patch) | |
| tree | 8e2c2e585ef056d36023dfb384b2806bebf312d3 /drivers/char/pcmcia/synclink_cs.c | |
| parent | [PPC] minor irq handler cleanups (diff) | |
| download | linux-a6f97b293b08877d945ea3f28926aa446dd7ca2e.tar.xz linux-a6f97b293b08877d945ea3f28926aa446dd7ca2e.zip | |
drivers/char: minor irq handler cleanups
- remove always-false tests
- don't overload 'irq' argument, pass data properly via dev_id
- remove pointless casts from void*
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/char/pcmcia/synclink_cs.c')
| -rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 279ff5005cec..4e84d233e5a2 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -1225,17 +1225,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; @@ -1327,7 +1325,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; } |