Skip to contentSkip to conversation

sound/seq_oss_writeq: remove

PATCH In review Nishanth Aravamudan 1 participant 1 message Feb 2, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 15/20 sound/seq_oss_writeq: remove

Hello,

Please consider applying.

Description: Remove deprecated interruptible_sleep_on_timeout() function call and replace with direct wait-queue usage. Patch is compile-tested.

sound/core/seq/oss/seq_oss_writeq.c +5 -1
@@ -26,6 +26,7 @@
 #include <sound/seq_oss_legacy.h>
 #include "../seq_lock.h"
 #include "../seq_clientmgr.h"
+#include <linux/wait.h>
 
 
 /*
@@ -89,6 +90,7 @@ snd_seq_oss_writeq_clear(seq_oss_writeq_
 int
 snd_seq_oss_writeq_sync(seq_oss_writeq_t *q)
 {
+	DEFINE_WAIT(wait);
 	seq_oss_devinfo_t *dp = q->dp;
 	abstime_t time;
 	unsigned long flags;
@@ -123,7 +125,9 @@ snd_seq_oss_writeq_sync(seq_oss_writeq_t
 		
 	/* wait for echo event */
 	spin_unlock(&q->sync_lock);
-	interruptible_sleep_on_timeout(&q->sync_sleep, HZ);
+	prepare_to_wait(&q->sync_sleep, &wait, TASK_INTERRUPTIBLE);
+	schedule_timeout(HZ);
+	finish_wait(&q->sync_sleep, &wait);
 	spin_lock(&q->sync_lock);
 	if (signal_pending(current)) {
 		/* interrupted - return 0 to finish sync */

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