diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 14:21:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 14:21:45 -0700 |
| commit | 5a43c09d1b65da614620b1985633e3251b4f9b99 (patch) | |
| tree | 3ecbd9dbec12cd023030baa0b1919498fe4e03c9 /drivers/net/irda/ali-ircc.c | |
| parent | 659564c8adfe1765476beee8d55cd18986946892 (diff) | |
| parent | 5d347c8abaab1e8c24272a53099c22482855783e (diff) | |
| download | kernel_replicant_linux-5a43c09d1b65da614620b1985633e3251b4f9b99.tar.gz kernel_replicant_linux-5a43c09d1b65da614620b1985633e3251b4f9b99.tar.bz2 kernel_replicant_linux-5a43c09d1b65da614620b1985633e3251b4f9b99.zip | |
Merge branch 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
drivers/isdn/act2000: kill irq2card_map
drivers/net/eepro: kill dead code
Various drivers' irq handlers: kill dead code, needless casts
drivers/net: eliminate irq handler impossible checks, needless casts
arch/i386/kernel/time: don't shadow 'irq' function arg
Diffstat (limited to 'drivers/net/irda/ali-ircc.c')
| -rw-r--r-- | drivers/net/irda/ali-ircc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 971e2dee1e6b..cebf8c374bc5 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c @@ -662,19 +662,13 @@ static int ali_ircc_read_dongle_id (int i, chipio_t *info) */ static irqreturn_t ali_ircc_interrupt(int irq, void *dev_id) { - struct net_device *dev = (struct net_device *) dev_id; + struct net_device *dev = dev_id; struct ali_ircc_cb *self; int ret; IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __FUNCTION__); - if (!dev) { - IRDA_WARNING("%s: irq %d for unknown device.\n", - ALI_IRCC_DRIVER_NAME, irq); - return IRQ_NONE; - } - - self = (struct ali_ircc_cb *) dev->priv; + self = dev->priv; spin_lock(&self->lock); |