All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nishanth Aravamudan <nacc@us.ibm.com>
To: kj <kernel-janitors@lists.osdl.org>, lkml <linux-kernel@vger.kernel.org>
Subject: [KJ] [UPDATE PATCH] block/pcd: replace pcd_sleep() with
Date: Mon, 10 Jan 2005 21:16:41 +0000	[thread overview]
Message-ID: <20050110211641.GE9186@us.ibm.com> (raw)
In-Reply-To: <20050110164703.GD14307@nd47.coderock.org>

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

Sorry, slightly inaccurate description...

On Mon, Jan 10, 2005 at 05:47:03PM +0100, Domen Puncer wrote:
> Patchset of 171 patches is at http://coderock.org/kj/2.6.10-bk13-kj/
> 
> Quick patch summary: about 30 new, 30 merged, 30 dropped.
> Seems like most external trees are merged in -linus, so i'll start
> (re)sending old patches.

<snip>

> msleep_interruptible-drivers_block_pcd.patch

Please consider replacing with the following patch:

Description: Use msleep()/ssleep() instead of pcd_sleep() to guarantee
the task delays as expected. TASK_INTERRUPTIBLE is used in the original code,
however there is no check on the return values / for signals, thus I believe
TASK_UNINTERRUPTIBLE (and hence msleep()) is more appropriate. Remove definition
of pcd_sleep().

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


--- 2.6.10-v/drivers/block/paride/pcd.c	2004-12-24 13:35:39.000000000 -0800
+++ 2.6.10/drivers/block/paride/pcd.c	2005-01-10 12:20:29.000000000 -0800
@@ -534,12 +534,6 @@ static int pcd_tray_move(struct cdrom_de
 			 position ? "eject" : "close tray");
 }
 
-static void pcd_sleep(int cs)
-{
-	current->state = TASK_INTERRUPTIBLE;
-	schedule_timeout(cs);
-}
-
 static int pcd_reset(struct pcd_unit *cd)
 {
 	int i, k, flg;
@@ -549,11 +543,11 @@ static int pcd_reset(struct pcd_unit *cd
 	write_reg(cd, 6, 0xa0 + 0x10 * cd->drive);
 	write_reg(cd, 7, 8);
 
-	pcd_sleep(20 * HZ / 1000);	/* delay a bit */
+	msleep(20);			/* delay a bit */
 
 	k = 0;
 	while ((k++ < PCD_RESET_TMO) && (status_reg(cd) & IDE_BUSY))
-		pcd_sleep(HZ / 10);
+		msleep(100);
 
 	flg = 1;
 	for (i = 0; i < 5; i++)
@@ -592,7 +586,7 @@ static int pcd_ready_wait(struct pcd_uni
 		if (!(((p & 0xffff) == 0x0402) || ((p & 0xff) == 6)))
 			return p;
 		k++;
-		pcd_sleep(HZ);
+		ssleep(1);
 	}
 	return 0x000020;	/* timeout */
 }

[-- 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

WARNING: multiple messages have this Message-ID (diff)
From: Nishanth Aravamudan <nacc@us.ibm.com>
To: kj <kernel-janitors@lists.osdl.org>, lkml <linux-kernel@vger.kernel.org>
Subject: [UPDATE PATCH] block/pcd: replace pcd_sleep() with msleep()/ssleep()
Date: Mon, 10 Jan 2005 13:16:41 -0800	[thread overview]
Message-ID: <20050110211641.GE9186@us.ibm.com> (raw)
In-Reply-To: <20050110164703.GD14307@nd47.coderock.org>

Sorry, slightly inaccurate description...

On Mon, Jan 10, 2005 at 05:47:03PM +0100, Domen Puncer wrote:
> Patchset of 171 patches is at http://coderock.org/kj/2.6.10-bk13-kj/
> 
> Quick patch summary: about 30 new, 30 merged, 30 dropped.
> Seems like most external trees are merged in -linus, so i'll start
> (re)sending old patches.

<snip>

> msleep_interruptible-drivers_block_pcd.patch

Please consider replacing with the following patch:

Description: Use msleep()/ssleep() instead of pcd_sleep() to guarantee
the task delays as expected. TASK_INTERRUPTIBLE is used in the original code,
however there is no check on the return values / for signals, thus I believe
TASK_UNINTERRUPTIBLE (and hence msleep()) is more appropriate. Remove definition
of pcd_sleep().

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


--- 2.6.10-v/drivers/block/paride/pcd.c	2004-12-24 13:35:39.000000000 -0800
+++ 2.6.10/drivers/block/paride/pcd.c	2005-01-10 12:20:29.000000000 -0800
@@ -534,12 +534,6 @@ static int pcd_tray_move(struct cdrom_de
 			 position ? "eject" : "close tray");
 }
 
-static void pcd_sleep(int cs)
-{
-	current->state = TASK_INTERRUPTIBLE;
-	schedule_timeout(cs);
-}
-
 static int pcd_reset(struct pcd_unit *cd)
 {
 	int i, k, flg;
@@ -549,11 +543,11 @@ static int pcd_reset(struct pcd_unit *cd
 	write_reg(cd, 6, 0xa0 + 0x10 * cd->drive);
 	write_reg(cd, 7, 8);
 
-	pcd_sleep(20 * HZ / 1000);	/* delay a bit */
+	msleep(20);			/* delay a bit */
 
 	k = 0;
 	while ((k++ < PCD_RESET_TMO) && (status_reg(cd) & IDE_BUSY))
-		pcd_sleep(HZ / 10);
+		msleep(100);
 
 	flg = 1;
 	for (i = 0; i < 5; i++)
@@ -592,7 +586,7 @@ static int pcd_ready_wait(struct pcd_uni
 		if (!(((p & 0xffff) == 0x0402) || ((p & 0xff) == 6)))
 			return p;
 		k++;
-		pcd_sleep(HZ);
+		ssleep(1);
 	}
 	return 0x000020;	/* timeout */
 }

  parent reply	other threads:[~2005-01-10 21:16 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-01-10 16:47 [KJ] [announce] 2.6.10-bk13-kj Domen Puncer
2005-01-10 16:47 ` Domen Puncer
2005-01-10 18:04 ` [KJ] " Nishanth Aravamudan
2005-01-10 18:04   ` Nishanth Aravamudan
2005-01-10 18:10 ` Nishanth Aravamudan
2005-01-10 18:10   ` Nishanth Aravamudan
2005-01-10 18:19 ` [KJ] [UPDATE PATCH] scsi/osst: replace schedule_timeout() with Nishanth Aravamudan
2005-01-10 18:19   ` [UPDATE PATCH] scsi/osst: replace schedule_timeout() with msleep() Nishanth Aravamudan
2005-01-10 18:23 ` [KJ] [UPDATE PATCH] scsi/qla1280: replace schedule_timeout() with Nishanth Aravamudan
2005-01-10 18:23   ` [UPDATE PATCH] scsi/qla1280: replace schedule_timeout() with ssleep() Nishanth Aravamudan
2005-01-10 18:23 ` [KJ] [UPDATE PATCH] scsi/osst: replace schedule_timeout() with Nishanth Aravamudan
2005-01-10 18:23   ` [UPDATE PATCH] scsi/osst: replace schedule_timeout() with msleep() Nishanth Aravamudan
2005-01-10 20:08 ` [KJ] [UPDATE PATCH] drivers/dmapool: use TASK_UNINTERRUPTIBLE Nishanth Aravamudan
2005-01-10 20:08   ` [UPDATE PATCH] drivers/dmapool: use TASK_UNINTERRUPTIBLE instead of TASK_INTERRUPTIBLE Nishanth Aravamudan
2005-01-10 20:13 ` [KJ] [announce] 2.6.10-bk13-kj Nishanth Aravamudan
2005-01-10 20:13   ` Nishanth Aravamudan
2005-01-10 21:14 ` Nishanth Aravamudan
2005-01-10 21:14   ` Nishanth Aravamudan
2005-01-10 21:15 ` [KJ] [UPDATE PATCH] block/pf: replace pf_sleep() with msleep() Nishanth Aravamudan
2005-01-10 21:15   ` Nishanth Aravamudan
2005-01-10 21:16 ` Nishanth Aravamudan [this message]
2005-01-10 21:16   ` [UPDATE PATCH] block/pcd: replace pcd_sleep() with msleep()/ssleep() Nishanth Aravamudan
2005-01-10 21:18 ` [KJ] [UPDATE PATCH] block/pt: replace pt_sleep() with Nishanth Aravamudan
2005-01-10 21:18   ` [UPDATE PATCH] block/pt: replace pt_sleep() with msleep()/ssleep() Nishanth Aravamudan
2005-01-10 21:20 ` [KJ] [UPDATE PATCH] block/pg: replace pg_sleep() with msleep() Nishanth Aravamudan
2005-01-10 21:20   ` Nishanth Aravamudan
2005-01-10 21:27 ` [KJ] [UPDATE PATCH] cdrom/sonycd535: replace schedule_timeout() Nishanth Aravamudan
2005-01-10 21:27   ` [UPDATE PATCH] cdrom/sonycd535: replace schedule_timeout() with msleep() Nishanth Aravamudan
2005-01-10 23:12 ` [KJ] [UPDATE PATCH] message/mptbase: replace schedule_timeout() Nishanth Aravamudan
2005-01-10 23:12   ` [UPDATE PATCH] message/mptbase: replace schedule_timeout() with ssleep() Nishanth Aravamudan
2005-01-11  0:39 ` [KJ] [UPDATE PATCH] net/sb1000: replace nicedelay() " Nishanth Aravamudan
2005-01-11  0:39   ` Nishanth Aravamudan
2005-01-11  3:56   ` [KJ] Re: [UPDATE PATCH] net/sb1000: replace nicedelay() with Jeff Garzik
2005-01-11  3:56     ` [UPDATE PATCH] net/sb1000: replace nicedelay() with ssleep() Jeff Garzik
2005-01-11  4:10     ` [KJ] Re: [UPDATE PATCH] net/sb1000: replace nicedelay() with Nish Aravamudan
2005-01-11  4:10       ` [KJ] Re: [UPDATE PATCH] net/sb1000: replace nicedelay() with ssleep() Nish Aravamudan
2005-01-11  0:42 ` [KJ] [UPDATE PATCH] net/slip: replace schedule_timeout() with Nishanth Aravamudan
2005-01-11  0:42   ` [UPDATE PATCH] net/slip: replace schedule_timeout() with msleep() Nishanth Aravamudan
2005-01-11  0:56 ` [KJ] [UPDATE PATCH] sbus/envctrl: replace schedule_timeout() with Nishanth Aravamudan
2005-01-11  0:56   ` [UPDATE PATCH] sbus/envctrl: replace schedule_timeout() with msleep_interruptible() Nishanth Aravamudan
2005-01-11  1:00 ` [KJ] [UPDATE PATCH] scsi/st: replace schedule_timeout() with Nishanth Aravamudan
2005-01-11  1:00   ` [UPDATE PATCH] scsi/st: replace schedule_timeout() with msleep_interruptible() Nishanth Aravamudan

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=20050110211641.GE9186@us.ibm.com \
    --to=nacc@us.ibm.com \
    --cc=kernel-janitors@lists.osdl.org \
    --cc=linux-kernel@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.