diff options
Diffstat (limited to 'sound/pci/au88x0')
-rw-r--r-- | sound/pci/au88x0/au88x0.h | 3 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0_core.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h index b1cfc3c79d07..5ccf0b1ec670 100644 --- a/sound/pci/au88x0/au88x0.h +++ b/sound/pci/au88x0/au88x0.h | |||
@@ -236,8 +236,7 @@ static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode); | |||
236 | static int vortex_core_init(vortex_t * card); | 236 | static int vortex_core_init(vortex_t * card); |
237 | static int vortex_core_shutdown(vortex_t * card); | 237 | static int vortex_core_shutdown(vortex_t * card); |
238 | static void vortex_enable_int(vortex_t * card); | 238 | static void vortex_enable_int(vortex_t * card); |
239 | static irqreturn_t vortex_interrupt(int irq, void *dev_id, | 239 | static irqreturn_t vortex_interrupt(int irq, void *dev_id); |
240 | struct pt_regs *regs); | ||
241 | static int vortex_alsafmt_aspfmt(int alsafmt); | 240 | static int vortex_alsafmt_aspfmt(int alsafmt); |
242 | 241 | ||
243 | /* Connection stuff. */ | 242 | /* Connection stuff. */ |
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index 5299cce583d3..4a336eaae9d2 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c | |||
@@ -2385,7 +2385,7 @@ static void vortex_disable_int(vortex_t * card) | |||
2385 | hwread(card->mmio, VORTEX_CTRL) & ~CTRL_IRQ_ENABLE); | 2385 | hwread(card->mmio, VORTEX_CTRL) & ~CTRL_IRQ_ENABLE); |
2386 | } | 2386 | } |
2387 | 2387 | ||
2388 | static irqreturn_t vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 2388 | static irqreturn_t vortex_interrupt(int irq, void *dev_id) |
2389 | { | 2389 | { |
2390 | vortex_t *vortex = dev_id; | 2390 | vortex_t *vortex = dev_id; |
2391 | int i, handled; | 2391 | int i, handled; |
@@ -2462,7 +2462,7 @@ static irqreturn_t vortex_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
2462 | } | 2462 | } |
2463 | if (source & IRQ_MIDI) { | 2463 | if (source & IRQ_MIDI) { |
2464 | snd_mpu401_uart_interrupt(vortex->irq, | 2464 | snd_mpu401_uart_interrupt(vortex->irq, |
2465 | vortex->rmidi->private_data, regs); | 2465 | vortex->rmidi->private_data); |
2466 | handled = 1; | 2466 | handled = 1; |
2467 | } | 2467 | } |
2468 | 2468 | ||