[KJ] [PATCH] 9/34: block/swim_iop: replace interruptible_sleep_on()

[KJ] [PATCH] 9/34: block/swim_iop: replace interruptible_sleep_on()

[Nishanth Aravamudan]

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

Hi,

Please consider applying.

Description: Use wait_event_interruptible() instead of the deprecated
interruptible_sleep_on(). The change is pretty straight-forward, as the current
sleep is conditional.

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


--- 2.6.11-rc2-kj-v/drivers/block/swim_iop.c	2005-01-25 14:42:49.000000000 -0800
+++ 2.6.11-rc2-kj/drivers/block/swim_iop.c	2005-01-25 14:43:37.000000000 -0800
@@ -32,6 +32,7 @@
 #include <linux/fd.h>
 #include <linux/ioctl.h>
 #include <linux/blkdev.h>
+#include <linux/wait.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/mac_iop.h>
@@ -431,13 +432,11 @@ static int grab_drive(struct floppy_stat
 	local_irq_save(flags);
 	if (fs->state != idle) {
 		++fs->wanted;
-		while (fs->state != available) {
-			if (interruptible && signal_pending(current)) {
-				--fs->wanted;
-				local_irq_restore(flags);
-				return -EINTR;
-			}
-			interruptible_sleep_on(&fs->wait);
+		wait_event_interruptible(fs->wait, (fs->state == available));
+		if (interruptible && signal_pending(current)) {
+			--fs->wanted;
+			local_irq_restore(flags);
+			return -EINTR;
 		}
 		--fs->wanted;
 	}

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