From: domen@coderock.org
To: emoenke@gwdg.de
Cc: linux-kernel@vger.kernel.org, domen@coderock.org, nacc@us.ibm.com
Subject: [patch 4/6] 13/34: cdrom/mcd: remove sleep_on() usage
Date: Sun, 06 Mar 2005 11:32:01 +0100 [thread overview]
Message-ID: <20050306103201.A2F961F203@trashy.coderock.org> (raw)
Directly use wait-queues instead of the deprecated sleep_on().
This required adding a local waitqueue. Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
kj-domen/drivers/cdrom/mcd.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletion(-)
diff -puN drivers/cdrom/mcd.c~sleep_on-drivers_cdrom_mcd drivers/cdrom/mcd.c
--- kj/drivers/cdrom/mcd.c~sleep_on-drivers_cdrom_mcd 2005-03-05 16:11:47.000000000 +0100
+++ kj-domen/drivers/cdrom/mcd.c 2005-03-05 16:11:47.000000000 +0100
@@ -95,6 +95,7 @@
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/config.h>
+#include <linux/wait.h>
/* #define REALLY_SLOW_IO */
#include <asm/system.h>
@@ -1273,11 +1274,14 @@ static void mcdStatTimer(unsigned long d
static int getMcdStatus(int timeout)
{
int st;
+ DEFINE_WAIT(wait);
+ prepare_to_wait(&mcd_waitq, &wait, TASK_UNINTERRUPTIBLE);
McdTimeout = timeout;
mcd_timer.function = mcdStatTimer;
mod_timer(&mcd_timer, jiffies + 1);
- sleep_on(&mcd_waitq);
+ schedule();
+ finish_wait(&mcd_waitq, &wait);
if (McdTimeout <= 0)
return -1;
_
reply other threads:[~2005-03-06 10:34 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=20050306103201.A2F961F203@trashy.coderock.org \
--to=domen@coderock.org \
--cc=emoenke@gwdg.de \
--cc=linux-kernel@vger.kernel.org \
--cc=nacc@us.ibm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox