[Kernel-janitors] [PATCH 2.6.9-rc2 1/2] i2c/i2c-algo-ite: remove

[Kernel-janitors] [PATCH 2.6.9-rc2 1/2] i2c/i2c-algo-ite: remove

[Nishanth Aravamudan]

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

Any comments would be appreciated.

Description: Removes unused iic_sleep().

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

--- 2.6.9-rc2-vanilla/drivers/i2c/algos/i2c-algo-ite.c	2004-09-13 17:15:46.000000000 -0700
+++ 2.6.9-rc2/drivers/i2c/algos/i2c-algo-ite.c	2004-09-14 09:45:51.000000000 -0700
@@ -107,14 +107,6 @@ static int wait_for_bb(struct i2c_algo_i
 	return(timeout<=0);
 }
 
-/*
- * Puts this process to sleep for a period equal to timeout 
- */
-static inline void iic_sleep(unsigned long timeout)
-{
-	schedule_timeout( timeout * HZ);
-}
-
 /* After we issue a transaction on the IIC bus, this function
  * is called.  It puts this process to sleep until we get an interrupt from
  * from the controller telling us that the transaction we requested in complete.

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

[Kernel-janitors] [PATCH 2.6.9-rc2 1/2] ieee1394/nodemgr: replace

[Nishanth Aravamudan]

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

Any comments would be appreciated.

Description: Uses msleep_interruptible() in place of schedule_timeout()
to guarantee the task delays as expected.

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

--- 2.6.9-rc1-mm4-vanilla/drivers/ieee1394/nodemgr.c	2004-09-09 23:05:58.000000000 -0700
+++ 2.6.9-rc1-mm4/drivers/ieee1394/nodemgr.c	2004-09-10 11:41:07.000000000 -0700
@@ -70,8 +70,7 @@ static int nodemgr_bus_read(struct csr12
 		if (!ret)
 			break;
 
-		set_current_state(TASK_INTERRUPTIBLE);
-		if (schedule_timeout (HZ/3))
+		if (msleep_interruptible(334))
 			return -EINTR;
 	}
 
@@ -1496,7 +1495,7 @@ static int nodemgr_host_thread(void *__h
 		 * to make sure things settle down. */
 		for (i = 0; i < 4 ; i++) {
 			set_current_state(TASK_INTERRUPTIBLE);
-			if (schedule_timeout(HZ/16)) {
+			if (msleep_interruptible(63)) {
 				up(&nodemgr_serialize);
 				goto caught_signal;
 			}

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