[Kernel-janitors] [PATCH] message/mptbase: replace

[Kernel-janitors] [PATCH] message/mptbase: replace

[Nishanth Aravamudan]

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

I would appreciate any comments from the janitors list. This is one (of
many) cases where I made a decision about replacing

set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(some_time);

with

msleep(jiffies_to_msecs(some_time));

msleep() is not exactly the same as the previous code, but I only did
this replacement where I thought long delays were *desired*. If this is
not the case here, then just disregard this patch. 

Thanks,
Nish



Applys-to: 2.6.7

Description: Replace schedule_timeout() with msleep() to guarantee the
task delays for the desired time.

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


--- linux-vanilla/drivers/message/fusion/mptbase.c	2004-06-16 05:19:01.000000000 +0000
+++ linux-dev/drivers/message/fusion/mptbase.c	2004-07-12 18:56:59.000000000 +0000
@@ -3117,12 +3117,10 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int s
 		CHIPREG_WRITE32(&ioc->chip->WriteSequence, MPI_WRSEQ_5TH_KEY_VALUE);
 
 		/* wait 100 msec */
-		if (sleepFlag == CAN_SLEEP) {
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(100 * HZ / 1000);
-		} else {
+		if (sleepFlag == CAN_SLEEP)
+			msleep (100);
+		else
 			mdelay (100);
-		}
 
 		count++;
 		if (count > 20) {
@@ -3351,12 +3349,10 @@ KickStart(MPT_ADAPTER *ioc, int force, i
 		 */
 		SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET, sleepFlag);
 
-		if (sleepFlag == CAN_SLEEP) {
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(HZ);
-		} else {
+		if (sleepFlag == CAN_SLEEP)
+			msleep (1000);
+		else
 			mdelay (1000);
-		}
 	}
 
 	hard_reset_done = mpt_diag_reset(ioc, force, sleepFlag);
@@ -3445,12 +3441,10 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ign
 			CHIPREG_WRITE32(&ioc->chip->WriteSequence, MPI_WRSEQ_5TH_KEY_VALUE);
 
 			/* wait 100 msec */
-			if (sleepFlag == CAN_SLEEP) {
-				set_current_state(TASK_INTERRUPTIBLE);
-				schedule_timeout(100 * HZ / 1000);
-			} else {
+			if (sleepFlag == CAN_SLEEP)
+				msleep (100);
+			else
 				mdelay (100);
-			}
 
 			count++;
 			if (count > 20) {
@@ -3538,12 +3532,10 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ign
 				}
 
 				/* wait 1 sec */
-				if (sleepFlag == CAN_SLEEP) {
-					set_current_state(TASK_INTERRUPTIBLE);
-					schedule_timeout(HZ);
-				} else {
+				if (sleepFlag == CAN_SLEEP)
+					msleep (1000);
+				else
 					mdelay (1000);
-				}
 			}
 			if ((count = mpt_downloadboot(ioc, sleepFlag)) < 0) {
 				printk(KERN_WARNING MYNAM
@@ -3566,12 +3558,10 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ign
 				}
 
 				/* wait 1 sec */
-				if (sleepFlag == CAN_SLEEP) {
-					set_current_state(TASK_INTERRUPTIBLE);
-					schedule_timeout(HZ);
-				} else {
+				if (sleepFlag == CAN_SLEEP)
+					msleep (1000);
+				else
 					mdelay (1000);
-				}
 			}
 		}
 	}
@@ -3600,12 +3590,10 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ign
 		CHIPREG_WRITE32(&ioc->chip->WriteSequence, MPI_WRSEQ_5TH_KEY_VALUE);
 
 		/* wait 100 msec */
-		if (sleepFlag == CAN_SLEEP) {
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(100 * HZ / 1000);
-		} else {
+		if (sleepFlag == CAN_SLEEP)
+			msleep (100);
+		else
 			mdelay (100);
-		}
 
 		count++;
 		if (count > 20) {

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

Re: [Kernel-janitors] [PATCH] message/mptbase: replace

[maximilian attems]

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

On Mon, 26 Jul 2004, Nishanth Aravamudan wrote:

> I would appreciate any comments from the janitors list. This is one (of
> many) cases where I made a decision about replacing
> 
> set_current_state(TASK_INTERRUPTIBLE);
> schedule_timeout(some_time);
> 
> with
> 
> msleep(jiffies_to_msecs(some_time));
> 
> msleep() is not exactly the same as the previous code, but I only did
> this replacement where I thought long delays were *desired*. If this is
> not the case here, then just disregard this patch. 
> 
> Thanks,
> Nish
> 
> 
> 
> Applys-to: 2.6.7
> 
> Description: Replace schedule_timeout() with msleep() to guarantee the
> task delays for the desired time.
> 
> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
> 
> 
> --- linux-vanilla/drivers/message/fusion/mptbase.c	2004-06-16 05:19:01.000000000 +0000
> +++ linux-dev/drivers/message/fusion/mptbase.c	2004-07-12 18:56:59.000000000 +0000

could you please rework this one, it doesn't apply anymore to 2.6.8
i could do it but prefer to get next kjt patchset out soon.

a++ maks

ps patchfile output:
patching file drivers/message/fusion/mptbase.c
Hunk #1 succeeded at 3328 (offset 211 lines).
Hunk #2 FAILED at 3560.
Hunk #3 FAILED at 3652.
Hunk #4 FAILED at 3743.
Hunk #5 FAILED at 3769.
Hunk #6 FAILED at 3801.
5 out of 6 hunks FAILED -- saving rejects to file drivers/message/fusion/mptbase.c.rej 

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