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

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;