From: janitor@sternwelten.at
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org, janitor@sternwelten.at, nacc@us.ibm.com
Subject: [patch 05/10] ide/ide-cd: replace cdrom_sleep() with msleep()
Date: Sat, 20 Nov 2004 03:34:40 +0100 [thread overview]
Message-ID: <E1CVL5E-0001PI-KM@sputnik> (raw)
Any comments would be appreciated.
Description: Uses msleep() in place of cdrom_sleep()
to guarantee the task delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
---
linux-2.6.10-rc2-bk4-max/drivers/ide/ide-cd.c | 15 +--------------
1 files changed, 1 insertion(+), 14 deletions(-)
diff -puN drivers/ide/ide-cd.c~msleep-drivers_ide_ide-cd drivers/ide/ide-cd.c
--- linux-2.6.10-rc2-bk4/drivers/ide/ide-cd.c~msleep-drivers_ide_ide-cd 2004-11-19 17:15:27.000000000 +0100
+++ linux-2.6.10-rc2-bk4-max/drivers/ide/ide-cd.c 2004-11-19 17:15:27.000000000 +0100
@@ -1514,19 +1514,6 @@ static ide_startstop_t cdrom_do_packet_c
}
-/* Sleep for TIME jiffies.
- Not to be called from an interrupt handler. */
-static
-void cdrom_sleep (int time)
-{
- int sleep = time;
-
- do {
- set_current_state(TASK_INTERRUPTIBLE);
- sleep = schedule_timeout(sleep);
- } while (sleep);
-}
-
static
int cdrom_queue_packet_command(ide_drive_t *drive, struct request *rq)
{
@@ -1561,7 +1548,7 @@ int cdrom_queue_packet_command(ide_drive
/* The drive is in the process of loading
a disk. Retry, but wait a little to give
the drive time to complete the load. */
- cdrom_sleep(2 * HZ);
+ msleep(2000);
} else {
/* Otherwise, don't retry. */
retries = 0;
_
reply other threads:[~2004-11-20 3:15 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=E1CVL5E-0001PI-KM@sputnik \
--to=janitor@sternwelten.at \
--cc=akpm@osdl.org \
--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 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.