From: janitor@sternwelten.at
To: axboe@suse.de
Cc: linux-kernel@vger.kernel.org, janitor@sternwelten.at, nacc@us.ibm.com
Subject: [patch 5/9] block/pf: replace pf_sleep() with msleep_interruptible()
Date: Thu, 23 Sep 2004 22:44:23 +0200 [thread overview]
Message-ID: <E1CAaS0-0002SZ-5W@sputnik> (raw)
Any comments would be appreciated. This is a re-push of a patch I
submitted 20 July which hasn't been merged as of
2.6.9-rc1-mm5/2.6.9-rc2.
Description: msleep_interruptible() is used instead of pf_sleep()
to guarantee the task delays as expected. The defintion of pf_sleep()
is also removed.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
---
linux-2.6.9-rc2-bk7-max/drivers/block/paride/pf.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff -puN drivers/block/paride/pf.c~msleep_interruptible-drivers_block_pf drivers/block/paride/pf.c
--- linux-2.6.9-rc2-bk7/drivers/block/paride/pf.c~msleep_interruptible-drivers_block_pf 2004-09-21 21:07:53.000000000 +0200
+++ linux-2.6.9-rc2-bk7-max/drivers/block/paride/pf.c 2004-09-21 21:07:53.000000000 +0200
@@ -526,12 +526,6 @@ static void pf_eject(struct pf_unit *pf)
#define PF_RESET_TMO 30 /* in tenths of a second */
-static void pf_sleep(int cs)
-{
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(cs);
-}
-
/* the ATAPI standard actually specifies the contents of all 7 registers
after a reset, but the specification is ambiguous concerning the last
two bytes, and different drives interpret the standard differently.
@@ -546,11 +540,11 @@ static int pf_reset(struct pf_unit *pf)
write_reg(pf, 6, 0xa0+0x10*pf->drive);
write_reg(pf, 7, 8);
- pf_sleep(20 * HZ / 1000);
+ msleep_interruptible(20);
k = 0;
while ((k++ < PF_RESET_TMO) && (status_reg(pf) & STAT_BUSY))
- pf_sleep(HZ / 10);
+ msleep_interruptible(100);
flg = 1;
for (i = 0; i < 5; i++)
_
reply other threads:[~2004-09-24 1:46 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=E1CAaS0-0002SZ-5W@sputnik \
--to=janitor@sternwelten.at \
--cc=axboe@suse.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
Powered by JetHome