9/34: block/swim_iop: replace interruptible_sleep_on()
Subsystems (2)
PATCH 1/1 9/34: block/swim_iop: replace interruptible_sleep_on()
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 <[email protected]>
drivers/block/swim_iop.c +6 -7
@@ -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_statlocal_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; }
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors