Commit e6cf66c1 authored by Leonid V. Fedorenchik's avatar Leonid V. Fedorenchik Committed by Greg Kroah-Hartman

Staging: cx25821: Change indent with spaces to tabs 7

Change indent with spaces to tabs.
Signed-off-by: default avatarLeonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8e4ac074
...@@ -726,40 +726,37 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) ...@@ -726,40 +726,37 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
{ {
struct cx25821_buffer *buf = struct cx25821_buffer *buf =
container_of(vb, struct cx25821_buffer, vb); container_of(vb, struct cx25821_buffer, vb);
struct cx25821_buffer *prev; struct cx25821_buffer *prev;
struct cx25821_fh *fh = vq->priv_data; struct cx25821_fh *fh = vq->priv_data;
struct cx25821_dev *dev = fh->dev; struct cx25821_dev *dev = fh->dev;
struct cx25821_dmaqueue *q = &dev->channels[fh->channel_id].vidq; struct cx25821_dmaqueue *q = &dev->channels[fh->channel_id].vidq;
/* add jump to stopper */ /* add jump to stopper */
buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC); buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma); buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
buf->risc.jmp[2] = cpu_to_le32(0); /* bits 63-32 */ buf->risc.jmp[2] = cpu_to_le32(0); /* bits 63-32 */
dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]); dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
if (!list_empty(&q->queued)) { if (!list_empty(&q->queued)) {
list_add_tail(&buf->vb.queue, &q->queued); list_add_tail(&buf->vb.queue, &q->queued);
buf->vb.state = VIDEOBUF_QUEUED; buf->vb.state = VIDEOBUF_QUEUED;
dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf, dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf,
buf->vb.i); buf->vb.i);
} else if (list_empty(&q->active)) { } else if (list_empty(&q->active)) {
list_add_tail(&buf->vb.queue, &q->active); list_add_tail(&buf->vb.queue, &q->active);
cx25821_start_video_dma(dev, q, buf, cx25821_start_video_dma(dev, q, buf,
dev->channels[fh->channel_id]. dev->channels[fh->channel_id].sram_channels);
sram_channels); buf->vb.state = VIDEOBUF_ACTIVE;
buf->vb.state = VIDEOBUF_ACTIVE; buf->count = q->count++;
buf->count = q->count++; mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT); dprintk(2, "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
dprintk(2, buf, buf->vb.i, buf->count, q->count);
"[%p/%d] buffer_queue - first active, buf cnt = %d, \ } else {
q->count = %d\n", prev = list_entry(q->active.prev, struct cx25821_buffer,
buf, buf->vb.i, buf->count, q->count); vb.queue);
} else { if (prev->vb.width == buf->vb.width
prev =
list_entry(q->active.prev, struct cx25821_buffer, vb.queue);
if (prev->vb.width == buf->vb.width
&& prev->vb.height == buf->vb.height && prev->vb.height == buf->vb.height
&& prev->fmt == buf->fmt) { && prev->fmt == buf->fmt) {
list_add_tail(&buf->vb.queue, &q->active); list_add_tail(&buf->vb.queue, &q->active);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment