8/34: block/swim3: replace interruptible_sleep_on()
Subsystems (2)
PATCH 1/1 8/34: block/swim3: 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/swim3.c +6 -7
@@ -28,6 +28,7 @@#include <linux/devfs_fs_kernel.h> #include <linux/interrupt.h> #include <linux/module.h> +#include <linux/wait.h> #include <asm/io.h> #include <asm/dbdma.h> #include <asm/prom.h>
@@ -792,13 +793,11 @@ static int grab_drive(struct floppy_statcli ();if (fs->state != idle) { ++fs->wanted; -while (fs->state != available) { -if (interruptible &&signal_pending (current)) { - --fs->wanted; -restore_flags (flags); -return -EINTR ; - } -interruptible_sleep_on (&fs->wait); +wait_event_interruptible (fs->wait, (fs->state == available)); +if (interruptible &&signal_pending (current)) { + --fs->wanted; +restore_flags (flags); +return -EINTR ; } --fs->wanted; }
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors