V4L/DVB (6600): V4L: videobuf: don't chew up namespace STATE_.*, convert to VIDEOBUF_

s/STATE_NEEDS_INIT/VIDEOBUF_NEEDS_INIT/g
s/STATE_PREPARED/VIDEOBUF_PREPARED/g
s/STATE_QUEUED/VIDEOBUF_QUEUED/g
s/STATE_ACTIVE/VIDEOBUF_ACTIVE/g
s/STATE_DONE/VIDEOBUF_DONE/g
s/STATE_ERROR/VIDEOBUF_ERROR/g
s/STATE_IDLE/VIDEOBUF_IDLE/g

Signed-off-by: Brandon Philips <bphilips@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 67d1b1b1b254..b40bf2306fbc 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -61,7 +61,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct videobuf_queue *q,
         videobuf_waiton(&buf->vb,0,0);
         videobuf_dma_unmap(q, dma);
         videobuf_dma_free(dma);
-        buf->vb.state = STATE_NEEDS_INIT;
+        buf->vb.state = VIDEOBUF_NEEDS_INIT;
 }
 
 
@@ -83,7 +83,7 @@ int saa7146_buffer_queue(struct saa7146_dev *dev,
                 buf->activate(dev,buf,NULL);
         } else {
                 list_add_tail(&buf->vb.queue,&q->queue);
-                buf->vb.state = STATE_QUEUED;
+                buf->vb.state = VIDEOBUF_QUEUED;
                 DEB_D(("adding buffer %p to queue. (active buffer present)\n", buf));
         }
         return 0;
@@ -174,7 +174,7 @@ void saa7146_buffer_timeout(unsigned long data)
         spin_lock_irqsave(&dev->slock,flags);
         if (q->curr) {
                 DEB_D(("timeout on %p\n", q->curr));
-                saa7146_buffer_finish(dev,q,STATE_ERROR);
+                saa7146_buffer_finish(dev,q,VIDEOBUF_ERROR);
         }
 
         /* we don't restart the transfer here like other drivers do. when
@@ -366,7 +366,7 @@ static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait)
         }
 
         poll_wait(file, &buf->done, wait);
-        if (buf->state == STATE_DONE || buf->state == STATE_ERROR) {
+        if (buf->state == VIDEOBUF_DONE || buf->state == VIDEOBUF_ERROR) {
                 DEB_D(("poll succeeded!\n"));
                 return POLLIN|POLLRDNORM;
         }