2002-08-01 22:35:04

by Petr Vandrovec

Subject: [PATCH] es1371 synchronize_irq()

Hello Linus,
nobody else is apparently using OSS's es1371...

Patch below converts synchronize_irq() calls in es1371 to the new
format.
Petr Vandrovec
[email protected]

diff -urdN linux/sound/oss/es1371.c linux/sound/oss/es1371.c
--- linux/sound/oss/es1371.c 2002-07-31 10:48:09.000000000 +0000
+++ linux/sound/oss/es1371.c 2002-07-31 10:54:57.000000000 +0000
@@ -1597,12 +1597,12 @@
case SNDCTL_DSP_RESET:
if (file->f_mode & FMODE_WRITE) {
stop_dac2(s);
- synchronize_irq();
+ synchronize_irq(s->irq);
s->dma_dac2.swptr = s->dma_dac2.hwptr = s->dma_dac2.count = s->dma_dac2.total_bytes = 0;
}
if (file->f_mode & FMODE_READ) {
stop_adc(s);
- synchronize_irq();
+ synchronize_irq(s->irq);
s->dma_adc.swptr = s->dma_adc.hwptr = s->dma_adc.count = s->dma_adc.total_bytes = 0;
}
return 0;
@@ -2162,7 +2162,7 @@

case SNDCTL_DSP_RESET:
stop_dac1(s);
- synchronize_irq();
+ synchronize_irq(s->irq);
s->dma_dac1.swptr = s->dma_dac1.hwptr = s->dma_dac1.count = s->dma_dac1.total_bytes = 0;
return 0;

@@ -3001,7 +3001,7 @@
#endif /* ES1371_DEBUG */
outl(0, s->io+ES1371_REG_CONTROL); /* switch everything off */
outl(0, s->io+ES1371_REG_SERIAL_CONTROL); /* clear serial interrupts */
- synchronize_irq();
+ synchronize_irq(s->irq);
free_irq(s->irq, s);
if (s->gameport.io) {
gameport_unregister_port(&s->gameport);

2002-08-01 22:42:04

by Joe

Subject: Re: [PATCH] es1371 synchronize_irq()

Many of us use es1371/OSS - but are on 2.4 for now...

Joe

Petr Vandrovec wrote:

>Hello Linus,
> nobody else is apparently using OSS's es1371...
>
>Patch below converts synchronize_irq() calls in es1371 to the new
>format.
> Petr Vandrovec
> [email protected]
>
>diff -urdN linux/sound/oss/es1371.c linux/sound/oss/es1371.c
>--- linux/sound/oss/es1371.c 2002-07-31 10:48:09.000000000 +0000
>+++ linux/sound/oss/es1371.c 2002-07-31 10:54:57.000000000 +0000
>@@ -1597,12 +1597,12 @@
> case SNDCTL_DSP_RESET:
> if (file->f_mode & FMODE_WRITE) {
> stop_dac2(s);
>- synchronize_irq();
>+ synchronize_irq(s->irq);
> s->dma_dac2.swptr = s->dma_dac2.hwptr = s->dma_dac2.count = s->dma_dac2.total_bytes = 0;
> }
> if (file->f_mode & FMODE_READ) {
> stop_adc(s);
>- synchronize_irq();
>+ synchronize_irq(s->irq);
> s->dma_adc.swptr = s->dma_adc.hwptr = s->dma_adc.count = s->dma_adc.total_bytes = 0;
> }
> return 0;
>@@ -2162,7 +2162,7 @@
>
> case SNDCTL_DSP_RESET:
> stop_dac1(s);
>- synchronize_irq();
>+ synchronize_irq(s->irq);
> s->dma_dac1.swptr = s->dma_dac1.hwptr = s->dma_dac1.count = s->dma_dac1.total_bytes = 0;
> return 0;
>
>@@ -3001,7 +3001,7 @@
> #endif /* ES1371_DEBUG */
> outl(0, s->io+ES1371_REG_CONTROL); /* switch everything off */
> outl(0, s->io+ES1371_REG_SERIAL_CONTROL); /* clear serial interrupts */
>- synchronize_irq();
>+ synchronize_irq(s->irq);
> free_irq(s->irq, s);
> if (s->gameport.io) {
> gameport_unregister_port(&s->gameport);
>-
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to [email protected]
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at http://www.tux.org/lkml/
>
>
>