diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 17:21:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 17:21:45 -0400 |
| commit | 5a43c09d1b65da614620b1985633e3251b4f9b99 (patch) | |
| tree | 3ecbd9dbec12cd023030baa0b1919498fe4e03c9 /sound/oss/vwsnd.c | |
| parent | 659564c8adfe1765476beee8d55cd18986946892 (diff) | |
| parent | 5d347c8abaab1e8c24272a53099c22482855783e (diff) | |
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 'sound/oss/vwsnd.c')
| -rw-r--r-- | sound/oss/vwsnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c index 0cd4d6ec9862..6dfb9f4b03ec 100644 --- a/sound/oss/vwsnd.c +++ b/sound/oss/vwsnd.c | |||
| @@ -2235,7 +2235,7 @@ static void vwsnd_audio_write_intr(vwsnd_dev_t *devc, unsigned int status) | |||
| 2235 | 2235 | ||
| 2236 | static irqreturn_t vwsnd_audio_intr(int irq, void *dev_id) | 2236 | static irqreturn_t vwsnd_audio_intr(int irq, void *dev_id) |
| 2237 | { | 2237 | { |
| 2238 | vwsnd_dev_t *devc = (vwsnd_dev_t *) dev_id; | 2238 | vwsnd_dev_t *devc = dev_id; |
| 2239 | unsigned int status; | 2239 | unsigned int status; |
| 2240 | 2240 | ||
| 2241 | DBGEV("(irq=%d, dev_id=0x%p)\n", irq, dev_id); | 2241 | DBGEV("(irq=%d, dev_id=0x%p)\n", irq, dev_id); |