From: Gerd Knorr <kraxel@bytesex.org>
Use wait_event_interruptible() instead of the deprecated
interruptible_sleep_on().
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/media/video/zr36120.c | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff -puN drivers/media/video/zr36120.c~media-zr36120-replace-interruptible_sleep_on-with-wait_event_interruptible drivers/media/video/zr36120.c
--- 25/drivers/media/video/zr36120.c~media-zr36120-replace-interruptible_sleep_on-with-wait_event_interruptible 2005-03-11 12:32:19.000000000 -0800
+++ 25-akpm/drivers/media/video/zr36120.c 2005-03-11 12:32:19.000000000 -0800
@@ -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* dev
zoran_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* dev
return -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
_