diff options
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 6 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index dc69392eafa3..8a576b78bee5 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -420,7 +420,7 @@ static void snd_ice1712_set_input_clock_source(struct snd_ice1712 *ice, int spdi | |||
420 | * Interrupt handler | 420 | * Interrupt handler |
421 | */ | 421 | */ |
422 | 422 | ||
423 | static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 423 | static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id) |
424 | { | 424 | { |
425 | struct snd_ice1712 *ice = dev_id; | 425 | struct snd_ice1712 *ice = dev_id; |
426 | unsigned char status; | 426 | unsigned char status; |
@@ -433,7 +433,7 @@ static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id, struct pt_regs * | |||
433 | handled = 1; | 433 | handled = 1; |
434 | if (status & ICE1712_IRQ_MPU1) { | 434 | if (status & ICE1712_IRQ_MPU1) { |
435 | if (ice->rmidi[0]) | 435 | if (ice->rmidi[0]) |
436 | snd_mpu401_uart_interrupt(irq, ice->rmidi[0]->private_data, regs); | 436 | snd_mpu401_uart_interrupt(irq, ice->rmidi[0]->private_data); |
437 | outb(ICE1712_IRQ_MPU1, ICEREG(ice, IRQSTAT)); | 437 | outb(ICE1712_IRQ_MPU1, ICEREG(ice, IRQSTAT)); |
438 | status &= ~ICE1712_IRQ_MPU1; | 438 | status &= ~ICE1712_IRQ_MPU1; |
439 | } | 439 | } |
@@ -441,7 +441,7 @@ static irqreturn_t snd_ice1712_interrupt(int irq, void *dev_id, struct pt_regs * | |||
441 | outb(ICE1712_IRQ_TIMER, ICEREG(ice, IRQSTAT)); | 441 | outb(ICE1712_IRQ_TIMER, ICEREG(ice, IRQSTAT)); |
442 | if (status & ICE1712_IRQ_MPU2) { | 442 | if (status & ICE1712_IRQ_MPU2) { |
443 | if (ice->rmidi[1]) | 443 | if (ice->rmidi[1]) |
444 | snd_mpu401_uart_interrupt(irq, ice->rmidi[1]->private_data, regs); | 444 | snd_mpu401_uart_interrupt(irq, ice->rmidi[1]->private_data); |
445 | outb(ICE1712_IRQ_MPU2, ICEREG(ice, IRQSTAT)); | 445 | outb(ICE1712_IRQ_MPU2, ICEREG(ice, IRQSTAT)); |
446 | status &= ~ICE1712_IRQ_MPU2; | 446 | status &= ~ICE1712_IRQ_MPU2; |
447 | } | 447 | } |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 71d6aedc0749..e9cbfdf37059 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -218,7 +218,7 @@ static unsigned int snd_vt1724_get_gpio_data(struct snd_ice1712 *ice) | |||
218 | * Interrupt handler | 218 | * Interrupt handler |
219 | */ | 219 | */ |
220 | 220 | ||
221 | static irqreturn_t snd_vt1724_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 221 | static irqreturn_t snd_vt1724_interrupt(int irq, void *dev_id) |
222 | { | 222 | { |
223 | struct snd_ice1712 *ice = dev_id; | 223 | struct snd_ice1712 *ice = dev_id; |
224 | unsigned char status; | 224 | unsigned char status; |
@@ -236,7 +236,7 @@ static irqreturn_t snd_vt1724_interrupt(int irq, void *dev_id, struct pt_regs *r | |||
236 | */ | 236 | */ |
237 | if ((status & VT1724_IRQ_MPU_RX)||(status & VT1724_IRQ_MPU_TX)) { | 237 | if ((status & VT1724_IRQ_MPU_RX)||(status & VT1724_IRQ_MPU_TX)) { |
238 | if (ice->rmidi[0]) | 238 | if (ice->rmidi[0]) |
239 | snd_mpu401_uart_interrupt(irq, ice->rmidi[0]->private_data, regs); | 239 | snd_mpu401_uart_interrupt(irq, ice->rmidi[0]->private_data); |
240 | outb(status & (VT1724_IRQ_MPU_RX|VT1724_IRQ_MPU_TX), ICEREG1724(ice, IRQSTAT)); | 240 | outb(status & (VT1724_IRQ_MPU_RX|VT1724_IRQ_MPU_TX), ICEREG1724(ice, IRQSTAT)); |
241 | status &= ~(VT1724_IRQ_MPU_RX|VT1724_IRQ_MPU_TX); | 241 | status &= ~(VT1724_IRQ_MPU_RX|VT1724_IRQ_MPU_TX); |
242 | } | 242 | } |