All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nishanth Aravamudan <nacc@us.ibm.com>
To: kernel-janitors@vger.kernel.org
Subject: [KJ] [PATCH 15/20] sound/seq_oss_writeq: remove
Date: Wed, 02 Feb 2005 22:03:44 +0000	[thread overview]
Message-ID: <20050202220344.GU2546@us.ibm.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 1177 bytes --]

Hello,

Please consider applying.

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

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>

--- 2.6.11-rc2-kj-v/sound/core/seq/oss/seq_oss_writeq.c	2005-01-24 09:28:58.000000000 -0800
+++ 2.6.11-rc2-kj/sound/core/seq/oss/seq_oss_writeq.c	2005-02-01 16:15:50.000000000 -0800
@@ -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 */

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

                 reply	other threads:[~2005-02-02 22:03 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050202220344.GU2546@us.ibm.com \
    --to=nacc@us.ibm.com \
    --cc=kernel-janitors@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.