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>

5 files changed, 26 insertions, 26 deletions

diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 40ffd7a5579a..8735227f7e47 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -417,7 +417,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
         buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP|RISC_IRQ1|RISC_CNT_INC);
         buf->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
 
-        buf->vb.state = STATE_PREPARED;
+        buf->vb.state = VIDEOBUF_PREPARED;
 
         chip->buf = buf;
         chip->dma_risc = dma;
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 62e8dd24c5f5..01e2ac98970b 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -220,7 +220,7 @@ cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf)
         videobuf_dma_unmap(q, dma);
         videobuf_dma_free(dma);
         btcx_riscmem_free((struct pci_dev *)q->dev, &buf->risc);
-        buf->vb.state = STATE_NEEDS_INIT;
+        buf->vb.state = VIDEOBUF_NEEDS_INIT;
 }
 
 /* ------------------------------------------------------------------ */
@@ -538,7 +538,7 @@ void cx88_wakeup(struct cx88_core *core,
                 do_gettimeofday(&buf->vb.ts);
                 dprintk(2,"[%p/%d] wakeup reg=%d buf=%d\n",buf,buf->vb.i,
                         count, buf->count);
-                buf->vb.state = STATE_DONE;
+                buf->vb.state = VIDEOBUF_DONE;
                 list_del(&buf->vb.queue);
                 wake_up(&buf->vb.done);
         }
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 60ac4234d84c..339a88a64f54 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -195,7 +195,7 @@ static int cx8802_restart_queue(struct cx8802_dev    *dev,
                                 list_del(&buf->vb.queue);
                                 list_add_tail(&buf->vb.queue,&q->active);
                                 cx8802_start_dma(dev, q, buf);
-                                buf->vb.state = STATE_ACTIVE;
+                                buf->vb.state = VIDEOBUF_ACTIVE;
                                 buf->count    = q->count++;
                                 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
                                 dprintk(1,"[%p/%d] restart_queue - first active\n",
@@ -206,7 +206,7 @@ static int cx8802_restart_queue(struct cx8802_dev    *dev,
                                    prev->fmt       == buf->fmt) {
                                 list_del(&buf->vb.queue);
                                 list_add_tail(&buf->vb.queue,&q->active);
-                                buf->vb.state = STATE_ACTIVE;
+                                buf->vb.state = VIDEOBUF_ACTIVE;
                                 buf->count    = q->count++;
                                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                                 dprintk(1,"[%p/%d] restart_queue - move to active\n",
@@ -242,7 +242,7 @@ int cx8802_buf_prepare(struct videobuf_queue *q, struct cx8802_dev *dev,
         if (0 != buf->vb.baddr  &&  buf->vb.bsize < size)
                 return -EINVAL;
 
-        if (STATE_NEEDS_INIT == buf->vb.state) {
+        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
                 buf->vb.width  = dev->ts_packet_size;
                 buf->vb.height = dev->ts_packet_count;
                 buf->vb.size   = size;
@@ -254,7 +254,7 @@ int cx8802_buf_prepare(struct videobuf_queue *q, struct cx8802_dev *dev,
                                      dma->sglist,
                                      buf->vb.width, buf->vb.height, 0);
         }
-        buf->vb.state = STATE_PREPARED;
+        buf->vb.state = VIDEOBUF_PREPARED;
         return 0;
 
  fail:
@@ -276,7 +276,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
                 dprintk( 1, "queue is empty - first active\n" );
                 list_add_tail(&buf->vb.queue,&cx88q->active);
                 cx8802_start_dma(dev, cx88q, buf);
-                buf->vb.state = STATE_ACTIVE;
+                buf->vb.state = VIDEOBUF_ACTIVE;
                 buf->count    = cx88q->count++;
                 mod_timer(&cx88q->timeout, jiffies+BUFFER_TIMEOUT);
                 dprintk(1,"[%p/%d] %s - first active\n",
@@ -286,7 +286,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
                 dprintk( 1, "queue is not empty - append to active\n" );
                 prev = list_entry(cx88q->active.prev, struct cx88_buffer, vb.queue);
                 list_add_tail(&buf->vb.queue,&cx88q->active);
-                buf->vb.state = STATE_ACTIVE;
+                buf->vb.state = VIDEOBUF_ACTIVE;
                 buf->count    = cx88q->count++;
                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                 dprintk( 1, "[%p/%d] %s - append to active\n",
@@ -306,7 +306,7 @@ static void do_cancel_buffers(struct cx8802_dev *dev, char *reason, int restart)
         while (!list_empty(&q->active)) {
                 buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
                 list_del(&buf->vb.queue);
-                buf->vb.state = STATE_ERROR;
+                buf->vb.state = VIDEOBUF_ERROR;
                 wake_up(&buf->vb.done);
                 dprintk(1,"[%p/%d] %s - dma=0x%08lx\n",
                         buf, buf->vb.i, reason, (unsigned long)buf->risc.dma);
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c
index babb08556406..d96ecfcf393a 100644
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
@@ -130,7 +130,7 @@ void cx8800_vbi_timeout(unsigned long data)
         while (!list_empty(&q->active)) {
                 buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
                 list_del(&buf->vb.queue);
-                buf->vb.state = STATE_ERROR;
+                buf->vb.state = VIDEOBUF_ERROR;
                 wake_up(&buf->vb.done);
                 printk("%s/0: [%p/%d] timeout - dma=0x%08lx\n", dev->core->name,
                        buf, buf->vb.i, (unsigned long)buf->risc.dma);
@@ -168,7 +168,7 @@ vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
         if (0 != buf->vb.baddr  &&  buf->vb.bsize < size)
                 return -EINVAL;
 
-        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  = VBI_LINE_LENGTH;
                 buf->vb.height = VBI_LINE_COUNT;
@@ -183,7 +183,7 @@ vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                                  buf->vb.width, 0,
                                  buf->vb.height);
         }
-        buf->vb.state = STATE_PREPARED;
+        buf->vb.state = VIDEOBUF_PREPARED;
         return 0;
 
  fail:
@@ -207,7 +207,7 @@ vbi_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
         if (list_empty(&q->active)) {
                 list_add_tail(&buf->vb.queue,&q->active);
                 cx8800_start_vbi_dma(dev, q, buf);
-                buf->vb.state = STATE_ACTIVE;
+                buf->vb.state = VIDEOBUF_ACTIVE;
                 buf->count    = q->count++;
                 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
                 dprintk(2,"[%p/%d] vbi_queue - first active\n",
@@ -216,7 +216,7 @@ vbi_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
         } else {
                 prev = list_entry(q->active.prev, struct cx88_buffer, vb.queue);
                 list_add_tail(&buf->vb.queue,&q->active);
-                buf->vb.state = STATE_ACTIVE;
+                buf->vb.state = VIDEOBUF_ACTIVE;
                 buf->count    = q->count++;
                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                 dprintk(2,"[%p/%d] buffer_queue - append to active\n",
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index c84dafbdb991..6d5ea8ce9830 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -486,7 +486,7 @@ static int restart_video_queue(struct cx8800_dev    *dev,
                 if (NULL == prev) {
                         list_move_tail(&buf->vb.queue, &q->active);
                         start_video_dma(dev, q, buf);
-                        buf->vb.state = STATE_ACTIVE;
+                        buf->vb.state = VIDEOBUF_ACTIVE;
                         buf->count    = q->count++;
                         mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
                         dprintk(2,"[%p/%d] restart_queue - first active\n",
@@ -496,7 +496,7 @@ static int restart_video_queue(struct cx8800_dev    *dev,
                            prev->vb.height == buf->vb.height &&
                            prev->fmt       == buf->fmt) {
                         list_move_tail(&buf->vb.queue, &q->active);
-                        buf->vb.state = STATE_ACTIVE;
+                        buf->vb.state = VIDEOBUF_ACTIVE;
                         buf->count    = q->count++;
                         prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                         dprintk(2,"[%p/%d] restart_queue - move to active\n",
@@ -553,7 +553,7 @@ buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                 init_buffer = 1;
         }
 
-        if (STATE_NEEDS_INIT == buf->vb.state) {
+        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
                 init_buffer = 1;
                 if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
                         goto fail;
@@ -601,7 +601,7 @@ buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                 fh->width, fh->height, fh->fmt->depth, fh->fmt->name,
                 (unsigned long)buf->risc.dma);
 
-        buf->vb.state = STATE_PREPARED;
+        buf->vb.state = VIDEOBUF_PREPARED;
         return 0;
 
  fail:
@@ -625,14 +625,14 @@ buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 
         if (!list_empty(&q->queued)) {
                 list_add_tail(&buf->vb.queue,&q->queued);
-                buf->vb.state = STATE_QUEUED;
+                buf->vb.state = VIDEOBUF_QUEUED;
                 dprintk(2,"[%p/%d] buffer_queue - append to queued\n",
                         buf, buf->vb.i);
 
         } else if (list_empty(&q->active)) {
                 list_add_tail(&buf->vb.queue,&q->active);
                 start_video_dma(dev, q, buf);
-                buf->vb.state = STATE_ACTIVE;
+                buf->vb.state = VIDEOBUF_ACTIVE;
                 buf->count    = q->count++;
                 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
                 dprintk(2,"[%p/%d] buffer_queue - first active\n",
@@ -644,7 +644,7 @@ buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
                     prev->vb.height == buf->vb.height &&
                     prev->fmt       == buf->fmt) {
                         list_add_tail(&buf->vb.queue,&q->active);
-                        buf->vb.state = STATE_ACTIVE;
+                        buf->vb.state = VIDEOBUF_ACTIVE;
                         buf->count    = q->count++;
                         prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                         dprintk(2,"[%p/%d] buffer_queue - append to active\n",
@@ -652,7 +652,7 @@ buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 
                 } else {
                         list_add_tail(&buf->vb.queue,&q->queued);
-                        buf->vb.state = STATE_QUEUED;
+                        buf->vb.state = VIDEOBUF_QUEUED;
                         dprintk(2,"[%p/%d] buffer_queue - first queued\n",
                                 buf, buf->vb.i);
                 }
@@ -822,8 +822,8 @@ video_poll(struct file *file, struct poll_table_struct *wait)
                         return POLLERR;
         }
         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;
 }
@@ -1496,7 +1496,7 @@ static void cx8800_vid_timeout(unsigned long data)
         while (!list_empty(&q->active)) {
                 buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
                 list_del(&buf->vb.queue);
-                buf->vb.state = STATE_ERROR;
+                buf->vb.state = VIDEOBUF_ERROR;
                 wake_up(&buf->vb.done);
                 printk("%s/0: [%p/%d] timeout - dma=0x%08lx\n", core->name,
                        buf, buf->vb.i, (unsigned long)buf->risc.dma);