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, 23 insertions, 23 deletions

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index db0e4b78e7dd..eb2c12eb2fc8 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1638,7 +1638,7 @@ bttv_switch_overlay(struct bttv *btv, struct bttv_fh *fh,
 
         dprintk("switch_overlay: enter [new=%p]\n",new);
         if (new)
-                new->vb.state = STATE_DONE;
+                new->vb.state = VIDEOBUF_DONE;
         spin_lock_irqsave(&btv->s_lock,flags);
         old = btv->screen;
         btv->screen = new;
@@ -1749,7 +1749,7 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
         }
 
         /* alloc risc memory */
-        if (STATE_NEEDS_INIT == buf->vb.state) {
+        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
                 redo_dma_risc = 1;
                 if (0 != (rc = videobuf_iolock(q,&buf->vb,&btv->fbuf)))
                         goto fail;
@@ -1759,7 +1759,7 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
                 if (0 != (rc = bttv_buffer_risc(btv,buf)))
                         goto fail;
 
-        buf->vb.state = STATE_PREPARED;
+        buf->vb.state = VIDEOBUF_PREPARED;
         return 0;
 
  fail:
@@ -1798,7 +1798,7 @@ buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
         struct bttv_fh *fh = q->priv_data;
         struct bttv    *btv = fh->btv;
 
-        buf->vb.state = STATE_QUEUED;
+        buf->vb.state = VIDEOBUF_QUEUED;
         list_add_tail(&buf->vb.queue,&btv->capture);
         if (!btv->curr.frame_irq) {
                 btv->loop_irq |= 1;
@@ -3102,8 +3102,8 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait)
         }
 
         poll_wait(file, &buf->vb.done, wait);
-        if (buf->vb.state == STATE_DONE ||
-            buf->vb.state == STATE_ERROR)
+        if (buf->vb.state == VIDEOBUF_DONE ||
+            buf->vb.state == VIDEOBUF_ERROR)
                 return POLLIN|POLLRDNORM;
         return 0;
 }
@@ -3699,20 +3699,20 @@ static void bttv_irq_timeout(unsigned long data)
         bttv_set_dma(btv, 0);
 
         /* wake up */
-        bttv_irq_wakeup_video(btv, &old, &new, STATE_ERROR);
-        bttv_irq_wakeup_vbi(btv, ovbi, STATE_ERROR);
+        bttv_irq_wakeup_video(btv, &old, &new, VIDEOBUF_ERROR);
+        bttv_irq_wakeup_vbi(btv, ovbi, VIDEOBUF_ERROR);
 
         /* cancel all outstanding capture / vbi requests */
         while (!list_empty(&btv->capture)) {
                 item = list_entry(btv->capture.next, struct bttv_buffer, vb.queue);
                 list_del(&item->vb.queue);
-                item->vb.state = STATE_ERROR;
+                item->vb.state = VIDEOBUF_ERROR;
                 wake_up(&item->vb.done);
         }
         while (!list_empty(&btv->vcapture)) {
                 item = list_entry(btv->vcapture.next, struct bttv_buffer, vb.queue);
                 list_del(&item->vb.queue);
-                item->vb.state = STATE_ERROR;
+                item->vb.state = VIDEOBUF_ERROR;
                 wake_up(&item->vb.done);
         }
 
@@ -3735,7 +3735,7 @@ bttv_irq_wakeup_top(struct bttv *btv)
 
         do_gettimeofday(&wakeup->vb.ts);
         wakeup->vb.field_count = btv->field_count;
-        wakeup->vb.state = STATE_DONE;
+        wakeup->vb.state = VIDEOBUF_DONE;
         wake_up(&wakeup->vb.done);
         spin_unlock(&btv->s_lock);
 }
@@ -3784,7 +3784,7 @@ bttv_irq_switch_video(struct bttv *btv)
         }
 
         /* wake up finished buffers */
-        bttv_irq_wakeup_video(btv, &old, &new, STATE_DONE);
+        bttv_irq_wakeup_video(btv, &old, &new, VIDEOBUF_DONE);
         spin_unlock(&btv->s_lock);
 }
 
@@ -3817,7 +3817,7 @@ bttv_irq_switch_vbi(struct bttv *btv)
         bttv_buffer_activate_vbi(btv, new);
         bttv_set_dma(btv, 0);
 
-        bttv_irq_wakeup_vbi(btv, old, STATE_DONE);
+        bttv_irq_wakeup_vbi(btv, old, VIDEOBUF_DONE);
         spin_unlock(&btv->s_lock);
 }
 
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c
index 58986f1a5f1a..e5979f77504c 100644
--- a/drivers/media/video/bt8xx/bttv-risc.c
+++ b/drivers/media/video/bt8xx/bttv-risc.c
@@ -582,7 +582,7 @@ bttv_dma_free(struct videobuf_queue *q,struct bttv *btv, struct bttv_buffer *buf
         videobuf_dma_free(dma);
         btcx_riscmem_free(btv->c.pci,&buf->bottom);
         btcx_riscmem_free(btv->c.pci,&buf->top);
-        buf->vb.state = STATE_NEEDS_INIT;
+        buf->vb.state = VIDEOBUF_NEEDS_INIT;
 }
 
 int
@@ -602,7 +602,7 @@ bttv_buffer_activate_vbi(struct bttv *btv,
         if (vbi) {
                 unsigned int crop, vdelay;
 
-                vbi->vb.state = STATE_ACTIVE;
+                vbi->vb.state = VIDEOBUF_ACTIVE;
                 list_del(&vbi->vb.queue);
 
                 /* VDELAY is start of video, end of VBI capturing. */
@@ -644,12 +644,12 @@ bttv_buffer_activate_video(struct bttv *btv,
         /* video capture */
         if (NULL != set->top  &&  NULL != set->bottom) {
                 if (set->top == set->bottom) {
-                        set->top->vb.state    = STATE_ACTIVE;
+                        set->top->vb.state    = VIDEOBUF_ACTIVE;
                         if (set->top->vb.queue.next)
                                 list_del(&set->top->vb.queue);
                 } else {
-                        set->top->vb.state    = STATE_ACTIVE;
-                        set->bottom->vb.state = STATE_ACTIVE;
+                        set->top->vb.state    = VIDEOBUF_ACTIVE;
+                        set->bottom->vb.state = VIDEOBUF_ACTIVE;
                         if (set->top->vb.queue.next)
                                 list_del(&set->top->vb.queue);
                         if (set->bottom->vb.queue.next)
@@ -666,7 +666,7 @@ bttv_buffer_activate_video(struct bttv *btv,
                 btaor((set->top->btswap & 0x0a) | (set->bottom->btswap & 0x05),
                       ~0x0f, BT848_COLOR_CTL);
         } else if (NULL != set->top) {
-                set->top->vb.state  = STATE_ACTIVE;
+                set->top->vb.state  = VIDEOBUF_ACTIVE;
                 if (set->top->vb.queue.next)
                         list_del(&set->top->vb.queue);
                 bttv_apply_geo(btv, &set->top->geo,1);
@@ -677,7 +677,7 @@ bttv_buffer_activate_video(struct bttv *btv,
                 btaor(set->top->btformat & 0xff, ~0xff, BT848_COLOR_FMT);
                 btaor(set->top->btswap & 0x0f,   ~0x0f, BT848_COLOR_CTL);
         } else if (NULL != set->bottom) {
-                set->bottom->vb.state = STATE_ACTIVE;
+                set->bottom->vb.state = VIDEOBUF_ACTIVE;
                 if (set->bottom->vb.queue.next)
                         list_del(&set->bottom->vb.queue);
                 bttv_apply_geo(btv, &set->bottom->geo,1);
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 346ce019bdcb..b924f05e3b74 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -142,7 +142,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
                 redo_dma_risc = 1;
         }
 
-        if (STATE_NEEDS_INIT == buf->vb.state) {
+        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
                 redo_dma_risc = 1;
                 if (0 != (rc = videobuf_iolock(q, &buf->vb, NULL)))
                         goto fail;
@@ -189,7 +189,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
         /* For bttv_buffer_activate_vbi(). */
         buf->geo.vdelay = min_vdelay;
 
-        buf->vb.state = STATE_PREPARED;
+        buf->vb.state = VIDEOBUF_PREPARED;
         buf->vb.field = field;
         dprintk("buf prepare %p: top=%p bottom=%p field=%s\n",
                 vb, &buf->top, &buf->bottom,
@@ -209,7 +209,7 @@ vbi_buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
         struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb);
 
         dprintk("queue %p\n",vb);
-        buf->vb.state = STATE_QUEUED;
+        buf->vb.state = VIDEOBUF_QUEUED;
         list_add_tail(&buf->vb.queue,&btv->vcapture);
         if (NULL == btv->cvbi) {
                 fh->btv->loop_irq |= 4;