Skip to contentSkip to conversation

sound/gus_pcm: remove

PATCH In review Nishanth Aravamudan 2 participants 5 messages Feb 2, 2005 – Feb 4, 2005

Subsystems (2)
Sound Kernel janitors
lore
Share & tools
lore

Nishanth Aravamudan

author
#0 lore raw

PATCH 13/20 sound/gus_pcm: remove

Hello,

Please consider applying.

Description: Replace deprecated interruptible_sleep_on_timeout() with wait_event_timeout(). Code is not identical, as the current sleeping system is 1 jiffy at a time checking atomic_read()'s return every iteration. Patch is compile-tested.

Signed-off-by Nishanth Aravamudan <[email protected]>
sound/isa/gus/gus_pcm.c +3 -9
@@ -697,16 +697,10 @@ static int snd_gf1_pcm_playback_close(sn
 	snd_gus_card_t *gus = snd_pcm_substream_chip(substream);
 	snd_pcm_runtime_t *runtime = substream->runtime;
 	gus_pcm_private_t *pcmp = runtime->private_data;
-	unsigned long jiffies_old;
+	
+	if (!wait_event_timeout(pcmp->sleep, (atomic_read(&pcmp->dma_count) <= 0), 2*HZ))
+		snd_printk("gf1 pcm - serious DMA problem\n");
 
-	jiffies_old = jiffies;
-	while (atomic_read(&pcmp->dma_count) > 0) {
-		interruptible_sleep_on_timeout(&pcmp->sleep, 1);
-		if ((signed long)(jiffies - jiffies_old) > 2*HZ) {
-			snd_printk("gf1 pcm - serious DMA problem\n");
-			break;
-		}
-	}
 	snd_gf1_dma_done(gus);	
 	return 0;
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw

Re: [PATCH 13/20] sound/gus_pcm: remove interruptible_sleep_on_timeout() usage

At Wed, 2 Feb 2005 11:50:13 -0800,

Quoted 11 lines · Nishanth Aravamudan

Hello,

Please consider applying.

Description: Replace deprecated interruptible_sleep_on_timeout() with wait_event_timeout(). Code is not identical, as the current sleeping system is 1 jiffy at a time checking atomic_read()'s return every iteration. Patch is compile-tested.

Signed-off-by Nishanth Aravamudan <[email protected]>

Thanks, I applied this one.

The other fixes for sound/seq/* stuff are not applied. Instead, I modified the code to use wait_event*() properly.
Now all sleep_on*() are gone from ALSA tree.

Takashi

-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting Tool for open source databases. Create drag-&-drop reports. Save time by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc. Download a FREE copy at http://www.intelliview.com/go/osdn_nl

#2 lore raw

At Wed, 2 Feb 2005 11:50:13 -0800,

Quoted 11 lines · Nishanth Aravamudan

Hello,

Please consider applying.

Description: Replace deprecated interruptible_sleep_on_timeout() with wait_event_timeout(). Code is not identical, as the current sleeping system is 1 jiffy at a time checking atomic_read()'s return every iteration. Patch is compile-tested.

Signed-off-by Nishanth Aravamudan <[email protected]>

Thanks, I applied this one.

The other fixes for sound/seq/* stuff are not applied. Instead, I modified the code to use wait_event*() properly.
Now all sleep_on*() are gone from ALSA tree.

Takashi

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#3 lore raw
Quoted 12 lines · Takashi Iwai

At Wed, 2 Feb 2005 11:50:13 -0800,

Quoted 10 lines · Nishanth Aravamudan

Hello,

Please consider applying.

Description: Replace deprecated interruptible_sleep_on_timeout() with wait_event_timeout(). Code is not identical, as the current sleeping system is 1 jiffy at a time checking atomic_read()'s return every iteration. Patch is compile-tested.

Quoted 7 lines
Quoted 1 line
Signed-off-by Nishanth Aravamudan <[email protected]>

Thanks, I applied this one.

The other fixes for sound/seq/* stuff are not applied. Instead, I modified the code to use wait_event*() properly.
Now all sleep_on*() are gone from ALSA tree.

Great! Thanks for all your help, Takashi!

-Nish

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#4 lore raw

Re: [PATCH 13/20] sound/gus_pcm: remove interruptible_sleep_on_timeout() usage

In reply to Takashi Iwai
Quoted 12 lines · Takashi Iwai

At Wed, 2 Feb 2005 11:50:13 -0800,

Quoted 10 lines · Nishanth Aravamudan

Hello,

Please consider applying.

Description: Replace deprecated interruptible_sleep_on_timeout() with wait_event_timeout(). Code is not identical, as the current sleeping system is 1 jiffy at a time checking atomic_read()'s return every iteration. Patch is compile-tested.

Quoted 7 lines
Quoted 1 line
Signed-off-by Nishanth Aravamudan <[email protected]>

Thanks, I applied this one.

The other fixes for sound/seq/* stuff are not applied. Instead, I modified the code to use wait_event*() properly.
Now all sleep_on*() are gone from ALSA tree.

Great! Thanks for all your help, Takashi!

-Nish

-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting Tool for open source databases. Create drag-&-drop reports. Save time by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc. Download a FREE copy at http://www.intelliview.com/go/osdn_nl