[KJ] RE: [PATCH] 17/34: cris/eeprom: replace

[KJ] RE: [PATCH] 17/34: cris/eeprom: replace

[Mikael Starvik]

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

Sure, thanks! I'll scan the rest of the drivers for similar things. 
Expect this to be included in 2.6.12.

Thanks for being a janitor and thanks for caring about our tiny arch!

/Mikael

-----Original Message-----
From: Nishanth Aravamudan [mailto:nacc@us.ibm.com] 
Sent: Wednesday, January 26, 2005 12:30 AM
To: Mikael Starvik
Cc: dev-etrax; kernel-janitors@lists.osdl.org
Subject: [PATCH] 17/34: cris/eeprom: replace interruptible_sleep_on() with
wait_event_interruptible()


Hi,

Please consider applying.

Description: Use wait_event_interruptible() instead of the deprecated
interruptible_sleep_on(). The replacements were both straight-forward as
the sleeps were conditionally-looped. Patch is compile-tested.

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

--- 2.6.11-rc2-kj-v/arch/cris/arch-v10/drivers/eeprom.c	2005-01-24
09:28:13.000000000 -0800
+++ 2.6.11-rc2-kj/arch/cris/arch-v10/drivers/eeprom.c	2005-01-25
15:28:54.000000000 -0800
@@ -94,6 +94,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/wait.h>
 #include <asm/uaccess.h>
 #include "i2c.h"
 
@@ -526,15 +527,9 @@ static ssize_t eeprom_read(struct file *
     return -EFAULT;
   }
   
-  while(eeprom.busy)
-  {
-    interruptible_sleep_on(&eeprom.wait_q);
-
-    /* bail out if we get interrupted */
-    if (signal_pending(current))
-      return -EINTR;
-    
-  }
+  wait_event_interruptible(eeprom.wait_q, !eeprom.busy);
+  if (signal_pending(current))
+    return -EINTR;
   eeprom.busy++;
 
   page = (unsigned char) (p >> 8);
@@ -604,13 +599,10 @@ static ssize_t eeprom_write(struct file 
     return -EFAULT;
   }
 
-  while(eeprom.busy)
-  {
-    interruptible_sleep_on(&eeprom.wait_q);
-    /* bail out if we get interrupted */
-    if (signal_pending(current))
-      return -EINTR;
-  }
+  wait_event_interruptible(eeprom.wait_q, !eeprom.busy);
+  /* bail out if we get interrupted */
+  if (signal_pending(current))
+    return -EINTR;
   eeprom.busy++;
   for(i = 0; (i < EEPROM_RETRIES) && (restart > 0); i++)
   {


[-- 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: [KJ] RE: [PATCH] 17/34: cris/eeprom: replace

[Nish Aravamudan]

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

On Wed, 26 Jan 2005 06:47:55 +0100, Mikael Starvik
<mikael.starvik@axis.com> wrote:
> Sure, thanks! I'll scan the rest of the drivers for similar things.
> Expect this to be included in 2.6.12.
> 
> Thanks for being a janitor and thanks for caring about our tiny arch!

No problem! As long as it's in mainline, we janitors will try to keep
it clean :)

As far as the arch, bear in mind that I am only able to compile-test
(and not even that necessarily, since I don't have cross-compilers for
all archs); so please build with the patch and see if the runtime
behavior is the same. Any feedback with that would be great!

Thanks,
Nish

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