media/zr36120: replace interruptible_sleep_on()
Subsystems (2)
PATCH 25/34 media/zr36120: replace interruptible_sleep_on()
Hi,
Please consider applying.
Description: Use wait_event_interruptible() instead of the deprecated interruptible_sleep_on().
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/media/video/zr36120.c +16 -18
@@ -30,6 +30,7 @@#include <linux/mm.h> #include <linux/pci.h> #include <linux/signal.h> +#include <linux/wait.h> #include <asm/io.h> #include <asm/pgtable.h> #include <asm/page.h>
@@ -899,12 +900,11 @@ long zoran_read(struct video_device* devzoran_cap (ztv,1 );/* wait till this buffer gets grabbed */ -while (unused->status ==FBUFFER_BUSY ) { -interruptible_sleep_on (&ztv->grabq); -/* see if a signal did it */ -if (signal_pending (current)) -return -EINTR ; - } +wait_event_interruptible (ztv->grabq, + (unused->status !=FBUFFER_BUSY )); +/* see if a signal did it */ +if (signal_pending (current)) +return -EINTR ; done = unused; }else
@@ -1326,12 +1326,11 @@ int zoran_ioctl(struct video_device* devreturn -EINVAL ;case FBUFFER_BUSY :/* wait till this buffer gets grabbed */ -while (ztv->grabinfo[i].status ==FBUFFER_BUSY ) { -interruptible_sleep_on (&ztv->grabq); -/* see if a signal did it */ -if (signal_pending (current)) -return -EINTR ; - } +wait_event_interruptible (ztv->grabq, + (ztv->grabinfo[i].status !=FBUFFER_BUSY )); +/* see if a signal did it */ +if (signal_pending (current)) +return -EINTR ;/* don't fall through; a DONE buffer is not UNUSED */ break ;case FBUFFER_DONE :
@@ -1640,12 +1639,11 @@ long vbi_read(struct video_device* dev,zoran_cap (ztv,1 );/* wait till this buffer gets grabbed */ -while (unused->status ==FBUFFER_BUSY ) { -interruptible_sleep_on (&ztv->vbiq); -/* see if a signal did it */ -if (signal_pending (current)) -return -EINTR ; - } +wait_event_interruptible (ztv->vbiq, + (unused->status !=FBUFFER_BUSY )); +/* see if a signal did it */ +if (signal_pending (current)) +return -EINTR ; done = unused; }else
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors