V4L/DVB (12732): cx25821: fix bad whitespacing

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 106 insertions, 106 deletions

diff --git a/drivers/staging/cx25821/cx25821-audups11.c b/drivers/staging/cx25821/cx25821-audups11.c
index a8e4dce88b98..4a60be2f688d 100644
--- a/drivers/staging/cx25821/cx25821-audups11.c
+++ b/drivers/staging/cx25821/cx25821-audups11.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the Conexant CX25821 PCIe bridge
  *
- *  Copyright (C) 2009 Conexant Systems Inc. 
+ *  Copyright (C) 2009 Conexant Systems Inc.
  *  Authors  <shu.lin@conexant.com>, <hiep.huynh@conexant.com>
  *  Based on Steven Toth <stoth@linuxtv.org> cx23885 driver
  *
@@ -40,37 +40,37 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
     dprintk(2, "jmp to stopper (0x%x)\n", buf->risc.jmp[1]);
 
     if (!list_empty(&q->queued)) {
-        list_add_tail(&buf->vb.queue, &q->queued);
-        buf->vb.state = VIDEOBUF_QUEUED;
-        dprintk(2, "[%p/%d] buffer_queue - append to queued\n", buf, buf->vb.i);
+	list_add_tail(&buf->vb.queue, &q->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);
-        cx25821_start_video_dma(dev, q, buf, &dev->sram_channels[SRAM_CH11]);
-        buf->vb.state = VIDEOBUF_ACTIVE;
-        buf->count    = q->count++;
-        mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
-        dprintk(2, "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
-                                buf, buf->vb. i, buf->count, q->count);
+	list_add_tail(&buf->vb.queue, &q->active);
+	cx25821_start_video_dma(dev, q, buf, &dev->sram_channels[SRAM_CH11]);
+	buf->vb.state = VIDEOBUF_ACTIVE;
+	buf->count    = q->count++;
+	mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
+	dprintk(2, "[%p/%d] buffer_queue - first active, buf cnt = %d, q->count = %d\n",
+				buf, buf->vb. i, buf->count, q->count);
     } else {
-        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->fmt       == buf->fmt) {
-            list_add_tail(&buf->vb.queue, &q->active);
-            buf->vb.state = VIDEOBUF_ACTIVE;
-            buf->count    = q->count++;
-            prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
-
-            /* 64 bit bits 63-32 */
-            prev->risc.jmp[2] = cpu_to_le32(0);
-            dprintk(2, "[%p/%d] buffer_queue - append to active, buf->count=%d\n",  buf, buf->vb.i, buf->count);
-
-        } else {
-            list_add_tail(&buf->vb.queue, &q->queued);
-            buf->vb.state = VIDEOBUF_QUEUED;
-            dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf, buf->vb.i);
-        }
+	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->fmt       == buf->fmt) {
+	    list_add_tail(&buf->vb.queue, &q->active);
+	    buf->vb.state = VIDEOBUF_ACTIVE;
+	    buf->count    = q->count++;
+	    prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+
+	    /* 64 bit bits 63-32 */
+	    prev->risc.jmp[2] = cpu_to_le32(0);
+	    dprintk(2, "[%p/%d] buffer_queue - append to active, buf->count=%d\n",  buf, buf->vb.i, buf->count);
+
+	} else {
+	    list_add_tail(&buf->vb.queue, &q->queued);
+	    buf->vb.state = VIDEOBUF_QUEUED;
+	    dprintk(2, "[%p/%d] buffer_queue - first queued\n", buf, buf->vb.i);
+	}
     }
 
     if (list_empty(&q->active))
@@ -99,18 +99,18 @@ static int video_open(struct file *file)
     lock_kernel();
     list_for_each(list, &cx25821_devlist)
     {
-        h = list_entry(list, struct cx25821_dev, devlist);
+	h = list_entry(list, struct cx25821_dev, devlist);
 
-        if (h->video_dev[SRAM_CH11] && h->video_dev[SRAM_CH11]->minor == minor)
-        {
-            dev  = h;
-            type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        }
+	if (h->video_dev[SRAM_CH11] && h->video_dev[SRAM_CH11]->minor == minor)
+	{
+	    dev  = h;
+	    type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+	}
     }
 
     if (NULL == dev) {
-        unlock_kernel();
-        return -ENODEV;
+	unlock_kernel();
+	return -ENODEV;
     }
 
     printk("open minor=%d type=%s\n", minor, v4l2_type_names[type]);
@@ -118,8 +118,8 @@ static int video_open(struct file *file)
     /* allocate + initialize per filehandle data */
     fh = kzalloc(sizeof(*fh), GFP_KERNEL);
     if (NULL == fh) {
-        unlock_kernel();
-        return -ENOMEM;
+	unlock_kernel();
+	return -ENOMEM;
     }
 
     file->private_data = fh;
@@ -128,21 +128,21 @@ static int video_open(struct file *file)
     fh->width    = 720;
 
     if(dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
-        fh->height = 576;
+	fh->height = 576;
     else
-        fh->height = 480;
-        
+	fh->height = 480;
+
     dev->channel_opened = 10;
     fh->fmt             = format_by_fourcc(V4L2_PIX_FMT_YUYV);
 
     v4l2_prio_open(&dev->prio,&fh->prio);
 
     videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
-                &dev->pci->dev, &dev->slock,
-                V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                V4L2_FIELD_INTERLACED,
-                sizeof(struct cx25821_buffer),
-                fh);
+		&dev->pci->dev, &dev->slock,
+		V4L2_BUF_TYPE_VIDEO_CAPTURE,
+		V4L2_FIELD_INTERLACED,
+		sizeof(struct cx25821_buffer),
+		fh);
 
     dprintk(1, "post videobuf_queue_init()\n");
     unlock_kernel();
@@ -156,15 +156,15 @@ static ssize_t video_read(struct file *file, char __user *data, size_t count, lo
 
     switch (fh->type)
     {
-        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-            if (res_locked(fh->dev, RESOURCE_VIDEO11))
-                return -EBUSY;
+	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+	    if (res_locked(fh->dev, RESOURCE_VIDEO11))
+		return -EBUSY;
 
-            return videobuf_read_one(&fh->vidq, data, count, ppos, file->f_flags & O_NONBLOCK);
+	    return videobuf_read_one(&fh->vidq, data, count, ppos, file->f_flags & O_NONBLOCK);
 
-        default:
-            BUG();
-            return 0;
+	default:
+	    BUG();
+	    return 0;
     }
 }
 
@@ -174,21 +174,21 @@ static unsigned int video_poll(struct file *file, struct poll_table_struct *wait
     struct cx25821_buffer *buf;
 
     if (res_check(fh, RESOURCE_VIDEO11)) {
-        /* streaming capture */
-        if (list_empty(&fh->vidq.stream))
-            return POLLERR;
-        buf = list_entry(fh->vidq.stream.next,
-            struct cx25821_buffer, vb.stream);
+	/* streaming capture */
+	if (list_empty(&fh->vidq.stream))
+	    return POLLERR;
+	buf = list_entry(fh->vidq.stream.next,
+	    struct cx25821_buffer, vb.stream);
     } else {
-        /* read() capture */
-        buf = (struct cx25821_buffer *)fh->vidq.read_buf;
-        if (NULL == buf)
-            return POLLERR;
+	/* read() capture */
+	buf = (struct cx25821_buffer *)fh->vidq.read_buf;
+	if (NULL == buf)
+	    return POLLERR;
     }
 
     poll_wait(file, &buf->vb.done, wait);
     if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR)
-        return POLLIN|POLLRDNORM;
+	return POLLIN|POLLRDNORM;
     return 0;
 }
 
@@ -199,17 +199,17 @@ static int video_release(struct file *file)
     struct cx25821_dev *dev = fh->dev;
 
     //stop the risc engine and fifo
-    //cx_write(channel11->dma_ctl, 0); 
+    //cx_write(channel11->dma_ctl, 0);
 
     /* stop video capture */
     if (res_check(fh, RESOURCE_VIDEO11)) {
-        videobuf_queue_cancel(&fh->vidq);
-        res_free(dev, fh, RESOURCE_VIDEO11);
+	videobuf_queue_cancel(&fh->vidq);
+	res_free(dev, fh, RESOURCE_VIDEO11);
     }
 
     if (fh->vidq.read_buf) {
-        buffer_release(&fh->vidq, fh->vidq.read_buf);
-        kfree(fh->vidq.read_buf);
+	buffer_release(&fh->vidq, fh->vidq.read_buf);
+	kfree(fh->vidq.read_buf);
     }
 
     videobuf_mmap_free(&fh->vidq);
@@ -230,17 +230,17 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
 
     if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE))
     {
-        return -EINVAL;
+	return -EINVAL;
     }
 
     if (unlikely(i != fh->type))
     {
-        return -EINVAL;
+	return -EINVAL;
     }
 
     if (unlikely(!res_get(dev, fh, get_resource(fh, RESOURCE_VIDEO11))))
     {
-        return -EBUSY;
+	return -EBUSY;
     }
 
     return videobuf_streamon(get_queue(fh));
@@ -253,14 +253,14 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
     int err, res;
 
     if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-        return -EINVAL;
+	return -EINVAL;
     if (i != fh->type)
-        return -EINVAL;
+	return -EINVAL;
 
     res = get_resource(fh, RESOURCE_VIDEO11);
     err = videobuf_streamoff(get_queue(fh));
     if (err < 0)
-        return err;
+	return err;
     res_free(dev, fh, res);
     return 0;
 }
@@ -272,18 +272,18 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, struct v4l2_forma
     struct cx25821_dev *dev  = ((struct cx25821_fh *)priv)->dev;
     int err;
 
-    if (fh) 
+    if (fh)
     {
-        err = v4l2_prio_check(&dev->prio, &fh->prio);
-        if (0 != err)
-            return err;
+	err = v4l2_prio_check(&dev->prio, &fh->prio);
+	if (0 != err)
+	    return err;
     }
 
     dprintk(2, "%s()\n", __func__);
     err = vidioc_try_fmt_vid_cap(file, priv, f);
 
     if (0 != err)
-        return err;
+	return err;
     fh->fmt        = format_by_fourcc(f->fmt.pix.pixelformat);
     fh->width      = f->fmt.pix.width;
     fh->height     = f->fmt.pix.height;
@@ -293,30 +293,30 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, struct v4l2_forma
     return 0;
 }
 
-static long video_ioctl_upstream11(struct file *file, unsigned int cmd, unsigned long arg)   
-{   
+static long video_ioctl_upstream11(struct file *file, unsigned int cmd, unsigned long arg)
+{
     struct cx25821_fh *fh = file->private_data;
     struct cx25821_dev *dev = fh->dev;
     int command = 0;
     struct upstream_user_struct *data_from_user;
 
-    
+
     data_from_user = (struct upstream_user_struct *)arg;
-    
+
     if( !data_from_user )
     {
-        printk("cx25821 in %s(): Upstream data is INVALID. Returning.\n", __func__);
-        return 0;
+	printk("cx25821 in %s(): Upstream data is INVALID. Returning.\n", __func__);
+	return 0;
     }
-    
+
     command = data_from_user->command;
-    
+
     if( command != UPSTREAM_START_AUDIO && command != UPSTREAM_STOP_AUDIO )
     {
-        return 0;
+	return 0;
     }
-        
-        
+
+
     dev->input_filename      = data_from_user->input_filename;
     dev->input_audiofilename = data_from_user->input_filename;
     dev->vid_stdname         = data_from_user->vid_stdname;
@@ -324,18 +324,18 @@ static long video_ioctl_upstream11(struct file *file, unsigned int cmd, unsigned
     dev->channel_select      = data_from_user->channel_select;
     dev->command             = data_from_user->command;
 
-   
+
     switch(command)
-    {           
-        case UPSTREAM_START_AUDIO:
-            cx25821_start_upstream_audio(dev, data_from_user);
-            break;
-
-        case UPSTREAM_STOP_AUDIO:
-            cx25821_stop_upstream_audio(dev);
-            break;            
+    {
+	case UPSTREAM_START_AUDIO:
+	    cx25821_start_upstream_audio(dev, data_from_user);
+	    break;
+
+	case UPSTREAM_STOP_AUDIO:
+	    cx25821_stop_upstream_audio(dev);
+	    break;
     }
-       
+
     return 0;
 }
 
@@ -366,11 +366,11 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
     struct cx25821_dev *dev = fh->dev;
     int err;
 
-    if (fh) 
+    if (fh)
     {
-        err = v4l2_prio_check(&dev->prio, &fh->prio);
-        if (0 != err)
-            return err;
+	err = v4l2_prio_check(&dev->prio, &fh->prio);
+	if (0 != err)
+	    return err;
     }
     return 0;
 }
@@ -382,7 +382,7 @@ static const struct v4l2_file_operations video_fops = {
     .read          = video_read,
     .poll          = video_poll,
     .mmap          = video_mmap,
-    .ioctl         = video_ioctl_upstream11,  
+    .ioctl         = video_ioctl_upstream11,
 };
 
 static const struct v4l2_ioctl_ops video_ioctl_ops = {