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>

3 files changed, 13 insertions, 13 deletions

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 67d1b1b1b25..b40bf2306fb 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;
         }
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index 6103484e444..c32dda973e9 100644
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -205,7 +205,7 @@ static int buffer_activate(struct saa7146_dev *dev,
                            struct saa7146_buf *next)
 {
         struct saa7146_vv *vv = dev->vv_data;
-        buf->vb.state = STATE_ACTIVE;
+        buf->vb.state = VIDEOBUF_ACTIVE;
 
         DEB_VBI(("dev:%p, buf:%p, next:%p\n",dev,buf,next));
         saa7146_set_vbi_capture(dev,buf,next);
@@ -238,7 +238,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e
         if (buf->vb.size != size)
                 saa7146_dma_free(dev,q,buf);
 
-        if (STATE_NEEDS_INIT == buf->vb.state) {
+        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
                 struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
 
                 buf->vb.width  = llength;
@@ -257,7 +257,7 @@ static int buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,e
                 if (0 != err)
                         return err;
         }
-        buf->vb.state = STATE_PREPARED;
+        buf->vb.state = VIDEOBUF_PREPARED;
         buf->activate = buffer_activate;
 
         return 0;
@@ -335,7 +335,7 @@ static void vbi_stop(struct saa7146_fh *fh, struct file *file)
         saa7146_write(dev, MC1, MASK_20);
 
         if (vv->vbi_q.curr) {
-                saa7146_buffer_finish(dev,&vv->vbi_q,STATE_DONE);
+                saa7146_buffer_finish(dev,&vv->vbi_q,VIDEOBUF_DONE);
         }
 
         videobuf_queue_cancel(&fh->vbi_q);
@@ -458,7 +458,7 @@ static void vbi_irq_done(struct saa7146_dev *dev, unsigned long status)
                 /* this must be += 2, one count for each field */
                 vv->vbi_fieldcount+=2;
                 vv->vbi_q.curr->vb.field_count = vv->vbi_fieldcount;
-                saa7146_buffer_finish(dev,&vv->vbi_q,STATE_DONE);
+                saa7146_buffer_finish(dev,&vv->vbi_q,VIDEOBUF_DONE);
         } else {
                 DEB_VBI(("dev:%p\n",dev));
         }
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index ae36d101006..c31ab480d8e 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1235,7 +1235,7 @@ static int buffer_activate (struct saa7146_dev *dev,
 {
         struct saa7146_vv *vv = dev->vv_data;
 
-        buf->vb.state = STATE_ACTIVE;
+        buf->vb.state = VIDEOBUF_ACTIVE;
         saa7146_set_capture(dev,buf,next);
 
         mod_timer(&vv->video_q.timeout, jiffies+BUFFER_TIMEOUT);
@@ -1281,7 +1281,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                 saa7146_dma_free(dev,q,buf);
         }
 
-        if (STATE_NEEDS_INIT == buf->vb.state) {
+        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
                 struct saa7146_format *sfmt;
 
                 buf->vb.bytesperline  = fh->video_fmt.bytesperline;
@@ -1314,7 +1314,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                 if (err)
                         goto oops;
         }
-        buf->vb.state = STATE_PREPARED;
+        buf->vb.state = VIDEOBUF_PREPARED;
         buf->activate = buffer_activate;
 
         return 0;
@@ -1453,7 +1453,7 @@ static void video_irq_done(struct saa7146_dev *dev, unsigned long st)
 
         /* only finish the buffer if we have one... */
         if( NULL != q->curr ) {
-                saa7146_buffer_finish(dev,q,STATE_DONE);
+                saa7146_buffer_finish(dev,q,VIDEOBUF_DONE);
         }
         saa7146_buffer_next(dev,q,0);