Staging: cx25821: Fix style issues
cover Staging: cx25821: Fix style issues
This patch series fixes up style issues in cx25821-video.{c,h} files in drivers/staging/cx25821
What the heck with patches 5-39? ... Well, in cx25821-video.c file there are lots of lines starting with 7 spaces where clearly this intented to be a tab; that is reported by checkpatch.pl script. And even more lines that start with one or more tabs and 7 spaces; this is intented to be 2 or more tabs instead and this is not reported by checkpatch.pl script (obviously). So, first, I fix up all that kind of wrong indents and resulting patch was too big and unreviewable. (around 2K lines) So, since I haven't thought of better way to make the patch reviewable, I decided to split that huge patch into small reviewable patches. The result is 35 patches. %-) If you can think of a better way to deal with this, let me know.
Leonid V. Fedorenchik (44):
Staging: cx25821: Fix labels' placement in cx25821-video.c
Staging: cx25821: Fix function signatures
Staging: cx25821: Fix obscure line endings
Staging: cx25821: Fix indent in comment
Staging: cx25821: Change indent with spaces to tabs 1
Staging: cx25821: Change indent with spaces to tabs 2
Staging: cx25821: Change indent with spaces to tabs 3
Staging: cx25821: Change indent with spaces to tabs 4
Staging: cx25821: Change indent with spaces to tabs 5
Staging: cx25821: Change indent with spaces to tabs 6
Staging: cx25821: Change indent with spaces to tabs 7
Staging: cx25821: Change indent with spaces to tabs 8
Staging: cx25821: Change indent with spaces to tabs 9
Staging: cx25821: Change indent with spaces to tabs 10
Staging: cx25821: Change indent with spaces to tabs 11
Staging: cx25821: Change indent with spaces to tabs 12
Staging: cx25821: Change indent with spaces to tabs 13
Staging: cx25821: Change indent with spaces to tabs 14
Staging: cx25821: Change indent with spaces to tabs 15
Staging: cx25821: Change indent with spaces to tabs 16
Staging: cx25821: Change indent with spaces to tabs 17
Staging: cx25821: Change indent with spaces to tabs 18
Staging: cx25821: Change indent with spaces to tabs 19
Staging: cx25821: Change indent with spaces to tabs 20
Staging: cx25821: Change indent with spaces to tabs 21
Staging: cx25821: Change indent with spaces to tabs 22
Staging: cx25821: Change indent with spaces to tabs 23
Staging: cx25821: Change indent with spaces to tabs 24
Staging: cx25821: Change indent with spaces to tabs 25
Staging: cx25821: Change indent with spaces to tabs 26
Staging: cx25821: Change indent with spaces to tabs 27
Staging: cx25821: Change indent with spaces to tabs 28
Staging: cx25821: Change indent with spaces to tabs 29
Staging: cx25821: Change indent with spaces to tabs 30
Staging: cx25821: Change indent with spaces to tabs 31
Staging: cx25821: Change indent with spaces to tabs 32
Staging: cx25821: Change indent with spaces to tabs 33
Staging: cx25821: Change indent with spaces to tabs 34
Staging: cx25821: Change indent with spaces to tabs 35
Staging: cx25821: Fix braces around statements in cx25821-video.c
Staging: cx25821: Replace :? by if-else in cx25821-video.c
Staging: cx25821: cx25821-video.h: Line up constant
Staging: cx25821: cx25821-video.h: Fix indent
Staging: cx25821: cx25821-video.h: Fix long lines
drivers/staging/cx25821/cx25821-video.c | 1244 ++++++++++++++++--------------- drivers/staging/cx25821/cx25821-video.h | 79 ++- 2 files changed, 669 insertions(+), 654 deletions(-)
PATCH 1/44 Staging: cx25821: Fix labels' placement in cx25821-video.c
Delete whitespace before labels.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/cx25821/cx25821-video.c +1 -1
@@ -679,7 +679,7 @@ int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,return 0 ; - fail: +fail:cx25821_free_buffer (q, buf);return rc; }
Signature · 1 line
1.7.0.4
PATCH 2/44 Staging: cx25821: Fix function signatures
In reply to Leonid V. FedorenchikFix long function signatures (over 80 characters) and indent them properly.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 49 ++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 17 deletions(-)
drivers/staging/cx25821/cx25821-video.c +32 -17
@@ -110,7 +110,8 @@ struct cx25821_fmt *cx25821_format_by_fourcc(unsigned int fourcc)return NULL ; } -void cx25821_dump_video_queue (struct cx25821_dev *dev,struct cx25821_dmaqueue *q) +void cx25821_dump_video_queue (struct cx25821_dev *dev, +struct cx25821_dmaqueue *q) {struct cx25821_buffer *buf;struct list_head *item;
@@ -220,7 +221,8 @@ static int cx25821_ctrl_query(struct v4l2_queryctrl *qctrl)*/ /* resource management */ -int cx25821_res_get (struct cx25821_dev *dev,struct cx25821_fh *fh,unsigned int bit) +int cx25821_res_get (struct cx25821_dev *dev,struct cx25821_fh *fh, +unsigned int bit) {dprintk (1 ,"%s()\n" , __func__);if (fh->resources & bit)
@@ -252,7 +254,8 @@ int cx25821_res_locked(struct cx25821_fh *fh, unsigned int bit)return fh->dev->channels[fh->channel_id].resources & bit; } -void cx25821_res_free (struct cx25821_dev *dev,struct cx25821_fh *fh,unsigned int bits) +void cx25821_res_free (struct cx25821_dev *dev,struct cx25821_fh *fh, +unsigned int bits) {BUG_ON ((fh->resources & bits) != bits);dprintk (1 ,"%s()\n" , __func__);
@@ -684,7 +687,8 @@ fail:return rc; } -void cx25821_buffer_release (struct videobuf_queue *q,struct videobuf_buffer *vb) +void cx25821_buffer_release (struct videobuf_queue *q, +struct videobuf_buffer *vb) {struct cx25821_buffer *buf = container_of(vb, struct cx25821_buffer, vb);
@@ -992,7 +996,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i) }static int vidioc_s_fmt_vid_cap (struct file *file,void *priv, -struct v4l2_format *f) +struct v4l2_format *f) {struct cx25821_fh *fh = priv;struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
@@ -1101,8 +1105,9 @@ static int vidioc_s_ctrl(struct file *file, void *priv,return cx25821_set_control (dev, ctl, fh->channel_id); } -/* VIDEO IOCTLS */ -int cx25821_vidioc_g_fmt_vid_cap (struct file *file,void *priv,struct v4l2_format *f) +/* VIDEO IOCTLS */ +int cx25821_vidioc_g_fmt_vid_cap (struct file *file,void *priv, +struct v4l2_format *f) {struct cx25821_fh *fh = priv;
@@ -1116,7 +1121,8 @@ int cx25821_vidioc_g_fmt_vid_cap(struct file *file, void *priv, struct v4l2_formreturn 0 ; } -int cx25821_vidioc_try_fmt_vid_cap (struct file *file,void *priv,struct v4l2_format *f) +int cx25821_vidioc_try_fmt_vid_cap (struct file *file,void *priv, +struct v4l2_format *f) {struct cx25821_fmt *fmt;enum v4l2_field field;
@@ -1162,7 +1168,8 @@ int cx25821_vidioc_try_fmt_vid_cap(struct file *file, void *priv, struct v4l2_foreturn 0 ; } -int cx25821_vidioc_querycap (struct file *file,void *priv,struct v4l2_capability *cap) +int cx25821_vidioc_querycap (struct file *file,void *priv, +struct v4l2_capability *cap) {struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
@@ -1189,13 +1196,15 @@ int cx25821_vidioc_enum_fmt_vid_cap(struct file *file, void *priv,return 0 ; } -int cx25821_vidioc_reqbufs (struct file *file,void *priv,struct v4l2_requestbuffers *p) +int cx25821_vidioc_reqbufs (struct file *file,void *priv, +struct v4l2_requestbuffers *p) {struct cx25821_fh *fh = priv;return videobuf_reqbufs (get_queue (fh), p); } -int cx25821_vidioc_querybuf (struct file *file,void *priv,struct v4l2_buffer *p) +int cx25821_vidioc_querybuf (struct file *file,void *priv, +struct v4l2_buffer *p) {struct cx25821_fh *fh = priv;return videobuf_querybuf (get_queue (fh), p);
@@ -1217,7 +1226,8 @@ int cx25821_vidioc_g_priority(struct file *file, void *f, enum v4l2_priority *p)return 0 ; } -int cx25821_vidioc_s_priority (struct file *file,void *f,enum v4l2_priority prio) +int cx25821_vidioc_s_priority (struct file *file,void *f, +enum v4l2_priority prio) {struct cx25821_fh *fh = f;struct cx25821_dev *dev = ((struct cx25821_fh *)f)->dev;
@@ -1280,7 +1290,8 @@ int cx25821_enum_input(struct cx25821_dev *dev, struct v4l2_input *i)return 0 ; } -int cx25821_vidioc_enum_input (struct file *file,void *priv,struct v4l2_input *i) +int cx25821_vidioc_enum_input (struct file *file,void *priv, +struct v4l2_input *i) {struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;dprintk (1 ,"%s()\n" , __func__);
@@ -1323,7 +1334,8 @@ int cx25821_vidioc_s_input(struct file *file, void *priv, unsigned int i) }#ifdef TUNER_FLAG -int cx25821_vidioc_g_frequency (struct file *file,void *priv,struct v4l2_frequency *f) +int cx25821_vidioc_g_frequency (struct file *file,void *priv, +struct v4l2_frequency *f) {struct cx25821_fh *fh = priv;struct cx25821_dev *dev = fh->dev;
@@ -1350,7 +1362,8 @@ int cx25821_set_freq(struct cx25821_dev *dev, struct v4l2_frequency *f)return 0 ; } -int cx25821_vidioc_s_frequency (struct file *file,void *priv,struct v4l2_frequency *f) +int cx25821_vidioc_s_frequency (struct file *file,void *priv, +struct v4l2_frequency *f) {struct cx25821_fh *fh = priv;struct cx25821_dev *dev;
@@ -1522,7 +1535,8 @@ static const struct v4l2_queryctrl *ctrl_by_id(unsigned int id)return NULL ; } -int cx25821_vidioc_g_ctrl (struct file *file,void *priv,struct v4l2_control *ctl) +int cx25821_vidioc_g_ctrl (struct file *file,void *priv, +struct v4l2_control *ctl) {struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;struct cx25821_fh *fh = priv;
@@ -1612,7 +1626,8 @@ static void cx25821_init_controls(struct cx25821_dev *dev, int chan_num) } } -int cx25821_vidioc_cropcap (struct file *file,void *priv,struct v4l2_cropcap *cropcap) +int cx25821_vidioc_cropcap (struct file *file,void *priv, +struct v4l2_cropcap *cropcap) {struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
Signature · 1 line
1.7.0.4
PATCH 3/44 Staging: cx25821: Fix obscure line endings
In reply to Leonid V. FedorenchikFix obscure line endings to less obscure ones. Rationale: readability.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/staging/cx25821/cx25821-video.c +1 -2
@@ -162,8 +162,7 @@ void cx25821_video_wakeup(struct cx25821_dev *dev, struct cx25821_dmaqueue *q,else mod_timer (&q->timeout, jiffies +BUFFER_TIMEOUT );if (bc !=1 ) -pr_err ("%s: %d buffers handled (should be 1)\n" , - __func__, bc); +pr_err ("%s: %d buffers handled (should be 1)\n" , __func__, bc); }#ifdef TUNER_FLAG
Signature · 1 line
1.7.0.4
PATCH 4/44 Staging: cx25821: Fix indent in comment
In reply to Leonid V. FedorenchikChange indent in comment to use tabs instead of spaces.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/cx25821/cx25821-video.c +11 -11
@@ -203,19 +203,19 @@ struct video_device *cx25821_vdev_init(struct cx25821_dev *dev,/* static int cx25821_ctrl_query(struct v4l2_queryctrl *qctrl) { -int i; +int i; -if (qctrl->id < V4L2_CID_BASE || qctrl->id >= V4L2_CID_LASTP1) -return -EINVAL; -for (i = 0; i < CX25821_CTLS; i++) -if (cx25821_ctls[i].v.id == qctrl->id) -break; -if (i == CX25821_CTLS) { -*qctrl = no_ctl; +if (qctrl->id < V4L2_CID_BASE || qctrl->id >= V4L2_CID_LASTP1) +return -EINVAL; +for (i = 0; i < CX25821_CTLS; i++) +if (cx25821_ctls[i].v.id == qctrl->id) +break; +if (i == CX25821_CTLS) { +*qctrl = no_ctl; +return 0; +} +*qctrl = cx25821_ctls[i].v; return 0; -} -*qctrl = cx25821_ctls[i].v; -return 0; } */
Signature · 1 line
1.7.0.4
PATCH 5/44 Staging: cx25821: Change indent with spaces to tabs 1
In reply to Leonid V. FedorenchikChanged indent with spaces to use tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/cx25821/cx25821-video.c +10 -10
@@ -230,14 +230,14 @@ int cx25821_res_get(struct cx25821_dev *dev, struct cx25821_fh *fh,/* is it free? */ mutex_lock (&dev->lock); -if (dev->channels[fh->channel_id].resources & bit) { +if (dev->channels[fh->channel_id].resources & bit) {/* no, someone else uses it */ mutex_unlock (&dev->lock);return 0 ; }/* it's free, grab it */ fh->resources |= bit; - dev->channels[fh->channel_id].resources |= bit; + dev->channels[fh->channel_id].resources |= bit;dprintk (1 ,"res: get %d\n" , bit);mutex_unlock (&dev->lock);return 1 ;
@@ -250,7 +250,7 @@ int cx25821_res_check(struct cx25821_fh *fh, unsigned int bit)int cx25821_res_locked (struct cx25821_fh *fh,unsigned int bit) { -return fh->dev->channels[fh->channel_id].resources & bit; +return fh->dev->channels[fh->channel_id].resources & bit; } void cx25821_res_free(struct cx25821_dev *dev, struct cx25821_fh *fh,
@@ -261,7 +261,7 @@ void cx25821_res_free(struct cx25821_dev *dev, struct cx25821_fh *fh,mutex_lock (&dev->lock); fh->resources &= ~bits; - dev->channels[fh->channel_id].resources &= ~bits; + dev->channels[fh->channel_id].resources &= ~bits;dprintk (1 ,"res: put %d\n" , bits);mutex_unlock (&dev->lock); }
@@ -355,7 +355,7 @@ int cx25821_restart_video_queue(struct cx25821_dev *dev, buf->vb.state =VIDEOBUF_ACTIVE ; buf->count = q->count++; prev->risc.jmp[1 ] =cpu_to_le32 (buf->risc.dma); - prev->risc.jmp[2 ] =cpu_to_le32 (0 );/* Bits 63 - 32 */ + prev->risc.jmp[2 ] =cpu_to_le32 (0 );/* Bits 63 - 32 */ }else {return 0 ; }
@@ -368,11 +368,11 @@ void cx25821_vid_timeout(unsigned long data)struct cx25821_data *timeout_data = (struct cx25821_data *)data;struct cx25821_dev *dev = timeout_data->dev;struct sram_channel *channel = timeout_data->channel; -struct cx25821_dmaqueue *q = &dev->channels[channel->i].vidq; +struct cx25821_dmaqueue *q = &dev->channels[channel->i].vidq;struct cx25821_buffer *buf;unsigned long flags; -/* cx25821_sram_channel_dump(dev, channel); */ +/* cx25821_sram_channel_dump(dev, channel); */ cx_clear (channel->dma_ctl,0x11 );spin_lock_irqsave (&dev->slock, flags);
@@ -394,7 +394,7 @@ int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status)u32 count =0 ;int handled =0 ;u32 mask; -struct sram_channel *channel = dev->channels[chan_num].sram_channels; +struct sram_channel *channel = dev->channels[chan_num].sram_channels; mask =cx_read (channel->int_msk);if (0 == (status & mask))
@@ -414,8 +414,8 @@ int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status)if (status &FLD_VID_DST_RISC1 ) {spin_lock (&dev->slock); count =cx_read (channel->gpcnt); -cx25821_video_wakeup (dev, - &dev->channels[channel->i].vidq, count); +cx25821_video_wakeup (dev, &dev->channels[channel->i].vidq, + count);spin_unlock (&dev->slock); handled++; }
Signature · 1 line
1.7.0.4
PATCH 6/44 Staging: cx25821: Change indent with spaces to tabs 2
In reply to Leonid V. FedorenchikChange indent with spaces to use tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-)
drivers/staging/cx25821/cx25821-video.c +11 -12
@@ -424,9 +424,8 @@ int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status)if (status &0x10 ) {dprintk (2 ,"stopper video\n" );spin_lock (&dev->slock); -cx25821_restart_video_queue (dev, - &dev->channels[channel->i].vidq, - channel); +cx25821_restart_video_queue (dev, + &dev->channels[channel->i].vidq, channel);spin_unlock (&dev->slock); handled++; }
@@ -449,18 +448,18 @@ void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num) {cx_clear (PCI_INT_MSK ,1 ); -if (dev->channels[chan_num].video_dev) { -if (video_is_registered (dev->channels[chan_num].video_dev)) -video_unregister_device ( - dev->channels[chan_num].video_dev); +if (dev->channels[chan_num].video_dev) { +if (video_is_registered (dev->channels[chan_num].video_dev)) +video_unregister_device ( + dev->channels[chan_num].video_dev);else -video_device_release ( - dev->channels[chan_num].video_dev); +video_device_release ( + dev->channels[chan_num].video_dev); - dev->channels[chan_num].video_dev =NULL ; + dev->channels[chan_num].video_dev =NULL ; -btcx_riscmem_free (dev->pci, - &dev->channels[chan_num].vidq.stopper); +btcx_riscmem_free (dev->pci, + &dev->channels[chan_num].vidq.stopper);pr_warn ("device %d released!\n" , chan_num); }
Signature · 1 line
1.7.0.4
PATCH 7/44 Staging: cx25821: Change indent with spaces to tabs 3
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 35 +++++++++++++++---------------- 1 files changed, 17 insertions(+), 18 deletions(-)
drivers/staging/cx25821/cx25821-video.c +17 -18
@@ -469,30 +469,29 @@ void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num)int cx25821_video_register (struct cx25821_dev *dev) {int err; -int i; +int i; -struct video_device cx25821_video_device = { - .name ="cx25821-video" , - .fops = &video_fops, - .minor =-1 , - .ioctl_ops = &video_ioctl_ops, - .tvnorms =CX25821_NORMS , - .current_norm =V4L2_STD_NTSC_M , - }; +struct video_device cx25821_video_device = { + .name ="cx25821-video" , + .fops = &video_fops, + .minor =-1 , + .ioctl_ops = &video_ioctl_ops, + .tvnorms =CX25821_NORMS , + .current_norm =V4L2_STD_NTSC_M , + };spin_lock_init (&dev->slock); -for (i =0 ; i <MAX_VID_CHANNEL_NUM -1 ; ++i) { -cx25821_init_controls (dev, i); +for (i =0 ; i <MAX_VID_CHANNEL_NUM -1 ; ++i) { +cx25821_init_controls (dev, i); -cx25821_risc_stopper (dev->pci, - &dev->channels[i].vidq.stopper, - dev->channels[i].sram_channels->dma_ctl, -0x11 ,0 ); +cx25821_risc_stopper (dev->pci, &dev->channels[i].vidq.stopper, + dev->channels[i].sram_channels->dma_ctl, +0x11 ,0 ); - dev->channels[i].sram_channels = &cx25821_sram_channels[i]; - dev->channels[i].video_dev =NULL ; - dev->channels[i].resources =0 ; + dev->channels[i].sram_channels = &cx25821_sram_channels[i]; + dev->channels[i].video_dev =NULL ; + dev->channels[i].resources =0 ;cx_write (dev->channels[i].sram_channels->int_stat,0xffffffff );
Signature · 1 line
1.7.0.4
PATCH 8/44 Staging: cx25821: Change indent with spaces to tabs 4
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-)
drivers/staging/cx25821/cx25821-video.c +13 -14
@@ -493,20 +493,19 @@ int cx25821_video_register(struct cx25821_dev *dev) dev->channels[i].video_dev =NULL ; dev->channels[i].resources =0 ; -cx_write (dev->channels[i].sram_channels->int_stat, -0xffffffff ); - -INIT_LIST_HEAD (&dev->channels[i].vidq.active); -INIT_LIST_HEAD (&dev->channels[i].vidq.queued); - - dev->channels[i].timeout_data.dev = dev; - dev->channels[i].timeout_data.channel = - &cx25821_sram_channels[i]; - dev->channels[i].vidq.timeout.function = - cx25821_vid_timeout; - dev->channels[i].vidq.timeout.data = - (unsigned long )&dev->channels[i].timeout_data; -init_timer (&dev->channels[i].vidq.timeout); +cx_write (dev->channels[i].sram_channels->int_stat,0xffffffff ); + +INIT_LIST_HEAD (&dev->channels[i].vidq.active); +INIT_LIST_HEAD (&dev->channels[i].vidq.queued); + + dev->channels[i].timeout_data.dev = dev; + dev->channels[i].timeout_data.channel = + &cx25821_sram_channels[i]; + dev->channels[i].vidq.timeout.function = + cx25821_vid_timeout; + dev->channels[i].vidq.timeout.data = + (unsigned long )&dev->channels[i].timeout_data; +init_timer (&dev->channels[i].vidq.timeout);/* register v4l devices */ dev->channels[i].video_dev = cx25821_vdev_init(dev,
Signature · 1 line
1.7.0.4
PATCH 9/44 Staging: cx25821: Change indent with spaces to tabs 5
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/cx25821/cx25821-video.c +10 -10
@@ -507,31 +507,31 @@ int cx25821_video_register(struct cx25821_dev *dev) (unsigned long )&dev->channels[i].timeout_data;init_timer (&dev->channels[i].vidq.timeout); -/* register v4l devices */ - dev->channels[i].video_dev =cx25821_vdev_init (dev, - dev->pci, &cx25821_video_device,"video" ); +/* register v4l devices */ + dev->channels[i].video_dev =cx25821_vdev_init (dev, + dev->pci, &cx25821_video_device,"video" ); - err =video_register_device (dev->channels[i].video_dev, -VFL_TYPE_GRABBER , video_nr[dev->nr]); + err =video_register_device (dev->channels[i].video_dev, +VFL_TYPE_GRABBER , video_nr[dev->nr]); -if (err <0 ) - goto fail_unreg; +if (err <0 ) + goto fail_unreg; } -/* set PCI interrupt */ +/* set PCI interrupt */ cx_set (PCI_INT_MSK ,0xff );/* initial device configuration */ mutex_lock (&dev->lock);#ifdef TUNER_FLAG - dev->tvnorm = cx25821_video_device.current_norm; + dev->tvnorm = cx25821_video_device.current_norm;cx25821_set_tvnorm (dev, dev->tvnorm);#endif mutex_unlock (&dev->lock); -return 0 ; +return 0 ; fail_unreg:cx25821_video_unregister (dev, i);
Signature · 1 line
1.7.0.4
PATCH 10/44 Staging: cx25821: Change indent with spaces to tabs 6
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/cx25821/cx25821-video.c +10 -10
@@ -534,7 +534,7 @@ int cx25821_video_register(struct cx25821_dev *dev)return 0 ; fail_unreg: -cx25821_video_unregister (dev, i); +cx25821_video_unregister (dev, i);return err; }
@@ -565,7 +565,7 @@ int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,u32 line0_offset, line1_offset;struct videobuf_dmabuf *dma =videobuf_to_dma (&buf->vb);int bpl_local =LINE_SIZE_D1 ; -int channel_opened = fh->channel_id; +int channel_opened = fh->channel_id;BUG_ON (NULL == fh->fmt); if (fh->width < 48 || fh->width > 720 ||
@@ -604,21 +604,21 @@ int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb, channel_opened = (channel_opened <0 || channel_opened >7 ) ?7 : channel_opened; -if (dev->channels[channel_opened] - .pixel_formats ==PIXEL_FRMT_411 ) +if (dev->channels[channel_opened].pixel_formats == +PIXEL_FRMT_411 ) buf->bpl = (buf->fmt->depth * buf->vb.width) >>3 ;else buf->bpl = (buf->fmt->depth >>3 ) * (buf->vb.width); -if (dev->channels[channel_opened] - .pixel_formats ==PIXEL_FRMT_411 ) { +if (dev->channels[channel_opened].pixel_formats == +PIXEL_FRMT_411 ) { bpl_local = buf->bpl; }else { - bpl_local = buf->bpl;/* Default */ + bpl_local = buf->bpl;/* Default */ if (channel_opened >=0 && channel_opened <=7 ) { -if (dev->channels[channel_opened] - .use_cif_resolution) { +if (dev->channels[channel_opened] + .use_cif_resolution) {if (dev->tvnorm &V4L2_STD_PAL_BG || dev->tvnorm &V4L2_STD_PAL_DK ) bpl_local =352 <<1 ;
@@ -724,7 +724,7 @@ int cx25821_video_mmap(struct file *file, struct vm_area_struct *vma)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);struct cx25821_buffer *prev;struct cx25821_fh *fh = vq->priv_data;
Signature · 1 line
1.7.0.4
PATCH 11/44 Staging: cx25821: Change indent with spaces to tabs 7
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 65 +++++++++++++++---------------- 1 files changed, 31 insertions(+), 34 deletions(-)
drivers/staging/cx25821/cx25821-video.c +31 -34
@@ -726,40 +726,37 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) {struct cx25821_buffer *buf = container_of(vb, struct cx25821_buffer, vb); -struct cx25821_buffer *prev; -struct cx25821_fh *fh = vq->priv_data; -struct cx25821_dev *dev = fh->dev; -struct cx25821_dmaqueue *q = &dev->channels[fh->channel_id].vidq; - -/* add jump to stopper */ - 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[2 ] =cpu_to_le32 (0 );/* bits 63-32 */ - -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); - - }else if (list_empty (&q->active)) { -list_add_tail (&buf->vb.queue, &q->active); -cx25821_start_video_dma (dev, q, buf, - dev->channels[fh->channel_id]. - sram_channels); - 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 +struct cx25821_buffer *prev; +struct cx25821_fh *fh = vq->priv_data; +struct cx25821_dev *dev = fh->dev; +struct cx25821_dmaqueue *q = &dev->channels[fh->channel_id].vidq; + +/* add jump to stopper */ + 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[2 ] =cpu_to_le32 (0 );/* bits 63-32 */ + +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); + + }else if (list_empty (&q->active)) { +list_add_tail (&buf->vb.queue, &q->active); +cx25821_start_video_dma (dev, q, buf, + dev->channels[fh->channel_id].sram_channels); + 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);
Signature · 1 line
1.7.0.4
PATCH 12/44 Staging: cx25821: Change indent with spaces to tabs 8
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 42 ++++++++++++++---------------- 1 files changed, 20 insertions(+), 22 deletions(-)
drivers/staging/cx25821/cx25821-video.c +18 -20
@@ -759,28 +759,26 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)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); +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); - }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); - } - } +/* 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); -if (list_empty (&q->active)) -dprintk (2 ,"active queue empty!\n" ); + }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)) +dprintk (2 ,"active queue empty!\n" ); }static struct videobuf_queue_ops cx25821_video_qops = {
Signature · 1 line
1.7.0.4
PATCH 13/44 Staging: cx25821: Change indent with spaces to tabs 9
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 43 +++++++++++++++---------------- 1 files changed, 21 insertions(+), 22 deletions(-)
drivers/staging/cx25821/cx25821-video.c +21 -22
@@ -782,32 +782,31 @@ static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) }static struct videobuf_queue_ops cx25821_video_qops = { - .buf_setup = cx25821_buffer_setup, - .buf_prepare = cx25821_buffer_prepare, - .buf_queue = buffer_queue, - .buf_release = cx25821_buffer_release, + .buf_setup = cx25821_buffer_setup, + .buf_prepare = cx25821_buffer_prepare, + .buf_queue = buffer_queue, + .buf_release = cx25821_buffer_release, };static int video_open (struct file *file) { -struct video_device *vdev =video_devdata (file); -struct cx25821_dev *h, *dev =video_drvdata (file); -struct cx25821_fh *fh; -struct list_head *list; -int minor =video_devdata (file)->minor; -enum v4l2_buf_type type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; -u32 pix_format; -int ch_id =0 ; -int i; - -dprintk (1 ,"open dev=%s type=%s\n" , -video_device_node_name (vdev), - v4l2_type_names[type]); - -/* allocate + initialize per filehandle data */ - fh =kzalloc (sizeof (*fh),GFP_KERNEL ); -if (NULL == fh) -return -ENOMEM ; +struct video_device *vdev =video_devdata (file); +struct cx25821_dev *h, *dev =video_drvdata (file); +struct cx25821_fh *fh; +struct list_head *list; +int minor =video_devdata (file)->minor; +enum v4l2_buf_type type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; +u32 pix_format; +int ch_id =0 ; +int i; + +dprintk (1 ,"open dev=%s type=%s\n" ,video_device_node_name (vdev), + v4l2_type_names[type]); + +/* allocate + initialize per filehandle data */ + fh =kzalloc (sizeof (*fh),GFP_KERNEL ); +if (NULL == fh) +return -ENOMEM ;mutex_lock (&cx25821_devlist_mutex);
Signature · 1 line
1.7.0.4
PATCH 14/44 Staging: cx25821: Change indent with spaces to tabs 10
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/staging/cx25821/cx25821-video.c +13 -13
@@ -810,25 +810,25 @@ static int video_open(struct file *file)mutex_lock (&cx25821_devlist_mutex); -list_for_each (list, &cx25821_devlist) - { - h = list_entry(list, struct cx25821_dev, devlist); +list_for_each (list, &cx25821_devlist) + { + h = list_entry(list, struct cx25821_dev, devlist); -for (i =0 ; i <MAX_VID_CHANNEL_NUM ; i++) { -if (h->channels[i].video_dev && +for (i =0 ; i <MAX_VID_CHANNEL_NUM ; i++) { +if (h->channels[i].video_dev && h->channels[i].video_dev->minor == minor) { - dev = h; - ch_id = i; - type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; - } - } - } + dev = h; + ch_id = i; + type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; + } + } + } -if (NULL == dev) { +if (NULL == dev) {mutex_unlock (&cx25821_devlist_mutex);kfree (fh);return -ENODEV ; - } + } file->private_data = fh; fh->dev = dev;
Signature · 1 line
1.7.0.4
PATCH 15/44 Staging: cx25821: Change indent with spaces to tabs 11
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 39 +++++++++++++++---------------- 1 files changed, 19 insertions(+), 20 deletions(-)
drivers/staging/cx25821/cx25821-video.c +16 -17
@@ -830,26 +830,25 @@ static int video_open(struct file *file)return -ENODEV ; } - file->private_data = fh; - fh->dev = dev; - fh->type = type; - fh->width =720 ; - fh->channel_id = ch_id; - -if (dev->tvnorm &V4L2_STD_PAL_BG || dev->tvnorm &V4L2_STD_PAL_DK ) - fh->height =576 ; -else - fh->height =480 ; + file->private_data = fh; + fh->dev = dev; + fh->type = type; + fh->width =720 ; + fh->channel_id = ch_id; + +if (dev->tvnorm &V4L2_STD_PAL_BG || dev->tvnorm &V4L2_STD_PAL_DK ) + fh->height =576 ; +else + fh->height =480 ; - dev->channel_opened = fh->channel_id; - pix_format = - (dev->channels[ch_id].pixel_formats == -PIXEL_FRMT_411 ) ?V4L2_PIX_FMT_Y41P :V4L2_PIX_FMT_YUYV ; - fh->fmt =cx25821_format_by_fourcc (pix_format); + dev->channel_opened = fh->channel_id; + pix_format = (dev->channels[ch_id].pixel_formats ==PIXEL_FRMT_411 ) ? +V4L2_PIX_FMT_Y41P :V4L2_PIX_FMT_YUYV ; + fh->fmt =cx25821_format_by_fourcc (pix_format); -v4l2_prio_open (&dev->channels[ch_id].prio, &fh->prio); +v4l2_prio_open (&dev->channels[ch_id].prio, &fh->prio); - videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops, + videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops, &dev->pci->dev, &dev->slock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_INTERLACED,
Signature · 1 line
1.7.0.4
PATCH 16/44 Staging: cx25821: Change indent with spaces to tabs 12
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/cx25821/cx25821-video.c +12 -12
@@ -854,29 +854,29 @@ static int video_open(struct file *file)V4L2_FIELD_INTERLACED , sizeof(struct cx25821_buffer), fh, NULL); -dprintk (1 ,"post videobuf_queue_init()\n" ); +dprintk (1 ,"post videobuf_queue_init()\n" );mutex_unlock (&cx25821_devlist_mutex); -return 0 ; +return 0 ; }static ssize_t video_read (struct file *file,char __user * data,size_t count,loff_t *ppos) { -struct cx25821_fh *fh = file->private_data; +struct cx25821_fh *fh = file->private_data; -switch (fh->type) { -case V4L2_BUF_TYPE_VIDEO_CAPTURE : -if (cx25821_res_locked (fh,RESOURCE_VIDEO0 )) -return -EBUSY ; +switch (fh->type) { +case V4L2_BUF_TYPE_VIDEO_CAPTURE : +if (cx25821_res_locked (fh,RESOURCE_VIDEO0 )) +return -EBUSY ; -return videobuf_read_one (&fh->vidq, data, count, ppos, +return videobuf_read_one (&fh->vidq, data, count, ppos, file->f_flags &O_NONBLOCK ); -default : -BUG (); -return 0 ; - } +default : +BUG (); +return 0 ; + } } static unsigned int video_poll(struct file *file,
Signature · 1 line
1.7.0.4
PATCH 17/44 Staging: cx25821: Change indent with spaces to tabs 13
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 60 +++++++++++++++--------------- 1 files changed, 30 insertions(+), 30 deletions(-)
drivers/staging/cx25821/cx25821-video.c +27 -27
@@ -882,41 +882,41 @@ static ssize_t video_read(struct file *file, char __user * data, size_t count,static unsigned int video_poll (struct file *file,struct poll_table_struct *wait) { -struct cx25821_fh *fh = file->private_data; -struct cx25821_buffer *buf; +struct cx25821_fh *fh = file->private_data; +struct cx25821_buffer *buf; -if (cx25821_res_check (fh,RESOURCE_VIDEO0 )) { -/* streaming capture */ -if (list_empty (&fh->vidq.stream)) -return POLLERR ; - buf =list_entry (fh->vidq.stream.next, +if (cx25821_res_check (fh,RESOURCE_VIDEO0 )) { +/* 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 ; - } + }else { +/* 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 ) { -if (buf->vb.state ==VIDEOBUF_DONE ) { -struct cx25821_dev *dev = fh->dev; +poll_wait (file, &buf->vb.done, wait); +if (buf->vb.state ==VIDEOBUF_DONE || buf->vb.state ==VIDEOBUF_ERROR ) { +if (buf->vb.state ==VIDEOBUF_DONE ) { +struct cx25821_dev *dev = fh->dev; -if (dev && dev->channels[fh->channel_id] - .use_cif_resolution) { -u8 cam_id = *((char *)buf->vb.baddr +3 ); -memcpy ((char *)buf->vb.baddr, +if (dev && dev->channels[fh->channel_id] + .use_cif_resolution) { +u8 cam_id = *((char *)buf->vb.baddr +3 ); +memcpy ((char *)buf->vb.baddr, (char *)buf->vb.baddr + (fh->width *2 ), (fh->width *2 )); - *((char *)buf->vb.baddr +3 ) = cam_id; - } - } + *((char *)buf->vb.baddr +3 ) = cam_id; + } + } -return POLLIN |POLLRDNORM ; - } +return POLLIN |POLLRDNORM ; + } -return 0 ; +return 0 ; }static int video_release (struct file *file)
Signature · 1 line
1.7.0.4
PATCH 18/44 Staging: cx25821: Change indent with spaces to tabs 14
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 36 +++++++++++++++--------------- 1 files changed, 18 insertions(+), 18 deletions(-)
drivers/staging/cx25821/cx25821-video.c +18 -18
@@ -921,30 +921,30 @@ static unsigned int video_poll(struct file *file,static int video_release (struct file *file) { -struct cx25821_fh *fh = file->private_data; -struct cx25821_dev *dev = fh->dev; +struct cx25821_fh *fh = file->private_data; +struct cx25821_dev *dev = fh->dev; -/* stop the risc engine and fifo */ -cx_write (channel0->dma_ctl,0 );/* FIFO and RISC disable */ +/* stop the risc engine and fifo */ +cx_write (channel0->dma_ctl,0 );/* FIFO and RISC disable */ -/* stop video capture */ -if (cx25821_res_check (fh,RESOURCE_VIDEO0 )) { -videobuf_queue_cancel (&fh->vidq); -cx25821_res_free (dev, fh,RESOURCE_VIDEO0 ); - } +/* stop video capture */ +if (cx25821_res_check (fh,RESOURCE_VIDEO0 )) { +videobuf_queue_cancel (&fh->vidq); +cx25821_res_free (dev, fh,RESOURCE_VIDEO0 ); + } -if (fh->vidq.read_buf) { -cx25821_buffer_release (&fh->vidq, fh->vidq.read_buf); -kfree (fh->vidq.read_buf); - } +if (fh->vidq.read_buf) { +cx25821_buffer_release (&fh->vidq, fh->vidq.read_buf); +kfree (fh->vidq.read_buf); + } -videobuf_mmap_free (&fh->vidq); +videobuf_mmap_free (&fh->vidq); -v4l2_prio_close (&dev->channels[fh->channel_id].prio, fh->prio); - file->private_data =NULL ; -kfree (fh); +v4l2_prio_close (&dev->channels[fh->channel_id].prio, fh->prio); + file->private_data =NULL ; +kfree (fh); -return 0 ; +return 0 ; }static int vidioc_streamon (struct file *file,void *priv,enum v4l2_buf_type i)
Signature · 1 line
1.7.0.4
PATCH 19/44 Staging: cx25821: Change indent with spaces to tabs 15
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/cx25821/cx25821-video.c +10 -10
@@ -949,20 +949,20 @@ static int video_release(struct file *file)static int vidioc_streamon (struct file *file,void *priv,enum v4l2_buf_type i) { -struct cx25821_fh *fh = priv; -struct cx25821_dev *dev = fh->dev; +struct cx25821_fh *fh = priv; +struct cx25821_dev *dev = fh->dev; -if (unlikely (fh->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE )) -return -EINVAL ; +if (unlikely (fh->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE )) +return -EINVAL ; -if (unlikely (i != fh->type)) -return -EINVAL ; +if (unlikely (i != fh->type)) +return -EINVAL ; -if (unlikely (!cx25821_res_get (dev, fh, -cx25821_get_resource (fh,RESOURCE_VIDEO0 )))) -return -EBUSY ; +if (unlikely (!cx25821_res_get (dev, fh,cx25821_get_resource (fh, +RESOURCE_VIDEO0 )))) +return -EBUSY ; -return videobuf_streamon (get_queue (fh)); +return videobuf_streamon (get_queue (fh)); }static int vidioc_streamoff (struct file *file,void *priv,enum v4l2_buf_type i)
Signature · 1 line
1.7.0.4
PATCH 20/44 Staging: cx25821: Change indent with spaces to tabs 16
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/cx25821/cx25821-video.c +13 -13
@@ -967,21 +967,21 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)static int vidioc_streamoff (struct file *file,void *priv,enum v4l2_buf_type i) { -struct cx25821_fh *fh = priv; -struct cx25821_dev *dev = fh->dev; -int err, res; +struct cx25821_fh *fh = priv; +struct cx25821_dev *dev = fh->dev; +int err, res; -if (fh->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; -if (i != fh->type) -return -EINVAL ; +if (fh->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) +return -EINVAL ; +if (i != fh->type) +return -EINVAL ; - res =cx25821_get_resource (fh,RESOURCE_VIDEO0 ); - err =videobuf_streamoff (get_queue (fh)); -if (err <0 ) -return err; -cx25821_res_free (dev, fh, res); -return 0 ; + res =cx25821_get_resource (fh,RESOURCE_VIDEO0 ); + err =videobuf_streamoff (get_queue (fh)); +if (err <0 ) +return err; +cx25821_res_free (dev, fh, res); +return 0 ; } static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
Signature · 1 line
1.7.0.4
PATCH 21/44 Staging: cx25821: Change indent with spaces to tabs 17
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/cx25821/cx25821-video.c +10 -10
@@ -987,18 +987,18 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)static int vidioc_s_fmt_vid_cap (struct file *file,void *priv,struct v4l2_format *f) { -struct cx25821_fh *fh = priv; -struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; +struct cx25821_fh *fh = priv; +struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;struct v4l2_mbus_framefmt mbus_fmt; -int err; -int pix_format =PIXEL_FRMT_422 ; +int err; +int pix_format =PIXEL_FRMT_422 ; -if (fh) { - err =v4l2_prio_check (&dev->channels[fh->channel_id] - .prio, fh->prio); -if (0 != err) -return err; - } +if (fh) { + err =v4l2_prio_check (&dev->channels[fh->channel_id].prio, + fh->prio); +if (0 != err) +return err; + }dprintk (2 ,"%s()\n" , __func__); err =cx25821_vidioc_try_fmt_vid_cap (file, priv, f);
Signature · 1 line
1.7.0.4
PATCH 22/44 Staging: cx25821: Change indent with spaces to tabs 18
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/cx25821/cx25821-video.c +11 -11
@@ -1000,21 +1000,21 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,return err; } -dprintk (2 ,"%s()\n" , __func__); - err =cx25821_vidioc_try_fmt_vid_cap (file, priv, f); +dprintk (2 ,"%s()\n" , __func__); + err =cx25821_vidioc_try_fmt_vid_cap (file, priv, f); -if (0 != err) -return err; +if (0 != err) +return err; - fh->fmt =cx25821_format_by_fourcc (f->fmt.pix.pixelformat); - fh->vidq.field = f->fmt.pix.field; + fh->fmt =cx25821_format_by_fourcc (f->fmt.pix.pixelformat); + fh->vidq.field = f->fmt.pix.field; -/* check if width and height is valid based on set standard */ -if (cx25821_is_valid_width (f->fmt.pix.width, dev->tvnorm)) - fh->width = f->fmt.pix.width; +/* check if width and height is valid based on set standard */ +if (cx25821_is_valid_width (f->fmt.pix.width, dev->tvnorm)) + fh->width = f->fmt.pix.width; -if (cx25821_is_valid_height (f->fmt.pix.height, dev->tvnorm)) - fh->height = f->fmt.pix.height; +if (cx25821_is_valid_height (f->fmt.pix.height, dev->tvnorm)) + fh->height = f->fmt.pix.height;if (f->fmt.pix.pixelformat ==V4L2_PIX_FMT_Y41P ) pix_format =PIXEL_FRMT_411 ;
Signature · 1 line
1.7.0.4
PATCH 23/44 Staging: cx25821: Change indent with spaces to tabs 19
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/cx25821/cx25821-video.c +15 -15
@@ -1016,30 +1016,30 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,if (cx25821_is_valid_height (f->fmt.pix.height, dev->tvnorm)) fh->height = f->fmt.pix.height; -if (f->fmt.pix.pixelformat ==V4L2_PIX_FMT_Y41P ) - pix_format =PIXEL_FRMT_411 ; -else if (f->fmt.pix.pixelformat ==V4L2_PIX_FMT_YUYV ) - pix_format =PIXEL_FRMT_422 ; -else -return -EINVAL ; +if (f->fmt.pix.pixelformat ==V4L2_PIX_FMT_Y41P ) + pix_format =PIXEL_FRMT_411 ; +else if (f->fmt.pix.pixelformat ==V4L2_PIX_FMT_YUYV ) + pix_format =PIXEL_FRMT_422 ; +else +return -EINVAL ; -cx25821_set_pixel_format (dev,SRAM_CH00 , pix_format); +cx25821_set_pixel_format (dev,SRAM_CH00 , pix_format); -/* check if cif resolution */ -if (fh->width ==320 || fh->width ==352 ) - dev->channels[fh->channel_id].use_cif_resolution =1 ; -else - dev->channels[fh->channel_id].use_cif_resolution =0 ; +/* check if cif resolution */ +if (fh->width ==320 || fh->width ==352 ) + dev->channels[fh->channel_id].use_cif_resolution =1 ; +else + dev->channels[fh->channel_id].use_cif_resolution =0 ; - dev->channels[fh->channel_id].cif_width = fh->width; -medusa_set_resolution (dev, fh->width,SRAM_CH00 ); + dev->channels[fh->channel_id].cif_width = fh->width; +medusa_set_resolution (dev, fh->width,SRAM_CH00 );dprintk (2 ,"%s(): width=%d height=%d field=%d\n" , __func__, fh->width, fh->height, fh->vidq.field);v4l2_fill_mbus_format (&mbus_fmt, &f->fmt.pix,V4L2_MBUS_FMT_FIXED );cx25821_call_all (dev, video, s_mbus_fmt, &mbus_fmt); -return 0 ; +return 0 ; }static int vidioc_dqbuf (struct file *file,void *priv,struct v4l2_buffer *p)
Signature · 1 line
1.7.0.4
PATCH 24/44 Staging: cx25821: Change indent with spaces to tabs 20
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 32 +++++++++++++++--------------- 1 files changed, 16 insertions(+), 16 deletions(-)
drivers/staging/cx25821/cx25821-video.c +16 -16
@@ -1044,37 +1044,37 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,static int vidioc_dqbuf (struct file *file,void *priv,struct v4l2_buffer *p) { -int ret_val =0 ; -struct cx25821_fh *fh = priv; -struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; +int ret_val =0 ; +struct cx25821_fh *fh = priv; +struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; - ret_val =videobuf_dqbuf (get_queue (fh), p, file->f_flags &O_NONBLOCK ); + ret_val =videobuf_dqbuf (get_queue (fh), p, file->f_flags &O_NONBLOCK ); - p->sequence = dev->channels[fh->channel_id].vidq.count; + p->sequence = dev->channels[fh->channel_id].vidq.count; -return ret_val; +return ret_val; }static int vidioc_log_status (struct file *file,void *priv) { -struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; -struct cx25821_fh *fh = priv; -char name[32 +2 ]; +struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; +struct cx25821_fh *fh = priv; +char name[32 +2 ]; -struct sram_channel *sram_ch = dev->channels[fh->channel_id] - .sram_channels; -u32 tmp =0 ; +struct sram_channel *sram_ch = dev->channels[fh->channel_id] + .sram_channels; +u32 tmp =0 ; -snprintf (name,sizeof (name),"%s/2" , dev->name); +snprintf (name,sizeof (name),"%s/2" , dev->name);pr_info ("%s/2: ============ START LOG STATUS ============\n" , dev->name); -cx25821_call_all (dev, core, log_status); - tmp =cx_read (sram_ch->dma_ctl); +cx25821_call_all (dev, core, log_status); + tmp =cx_read (sram_ch->dma_ctl);pr_info ("Video input 0 is %s\n" , (tmp &0x11 ) ?"streaming" :"stopped" );pr_info ("%s/2: ============= END LOG STATUS =============\n" , dev->name); -return 0 ; +return 0 ; } static int vidioc_s_ctrl(struct file *file, void *priv,
Signature · 1 line
1.7.0.4
PATCH 25/44 Staging: cx25821: Change indent with spaces to tabs 21
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/cx25821/cx25821-video.c +10 -10
@@ -1080,18 +1080,18 @@ static int vidioc_log_status(struct file *file, void *priv)static int vidioc_s_ctrl (struct file *file,void *priv,struct v4l2_control *ctl) { -struct cx25821_fh *fh = priv; -struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; -int err; +struct cx25821_fh *fh = priv; +struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; +int err; -if (fh) { - err =v4l2_prio_check (&dev->channels[fh->channel_id] - .prio, fh->prio); -if (0 != err) -return err; - } +if (fh) { + err =v4l2_prio_check (&dev->channels[fh->channel_id].prio, + fh->prio); +if (0 != err) +return err; + } -return cx25821_set_control (dev, ctl, fh->channel_id); +return cx25821_set_control (dev, ctl, fh->channel_id); }/* VIDEO IOCTLS */
Signature · 1 line
1.7.0.4
PATCH 26/44 Staging: cx25821: Change indent with spaces to tabs 22
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-)
drivers/staging/cx25821/cx25821-video.c +10 -11
@@ -1208,9 +1208,9 @@ int cx25821_vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *p)int cx25821_vidioc_g_priority (struct file *file,void *f,enum v4l2_priority *p) {struct cx25821_dev *dev = ((struct cx25821_fh *)f)->dev; -struct cx25821_fh *fh = f; +struct cx25821_fh *fh = f; - *p =v4l2_prio_max (&dev->channels[fh->channel_id].prio); + *p =v4l2_prio_max (&dev->channels[fh->channel_id].prio);return 0 ; }
@@ -1221,8 +1221,8 @@ int cx25821_vidioc_s_priority(struct file *file, void *f,struct cx25821_fh *fh = f;struct cx25821_dev *dev = ((struct cx25821_fh *)f)->dev; -return v4l2_prio_change (&dev->channels[fh->channel_id] - .prio, &fh->prio, prio); +return v4l2_prio_change (&dev->channels[fh->channel_id].prio, &fh->prio, + prio); }#ifdef TUNER_FLAG
@@ -1235,15 +1235,14 @@ int cx25821_vidioc_s_std(struct file *file, void *priv, v4l2_std_id * tvnorms)dprintk (1 ,"%s()\n" , __func__);if (fh) { - err =v4l2_prio_check (&dev->channels[fh->channel_id] - .prio, fh->prio); + err =v4l2_prio_check (&dev->channels[fh->channel_id].prio, + fh->prio);if (0 != err)return err; } -if (dev->tvnorm == *tvnorms) { +if (dev->tvnorm == *tvnorms)return 0 ; - }mutex_lock (&dev->lock);cx25821_set_tvnorm (dev, *tvnorms);
@@ -1257,7 +1256,7 @@ int cx25821_vidioc_s_std(struct file *file, void *priv, v4l2_std_id * tvnorms)int cx25821_enum_input (struct cx25821_dev *dev,struct v4l2_input *i) { -static const char *iname[] = { +static const char *const iname[] = { [CX25821_VMUX_COMPOSITE ] ="Composite" , [CX25821_VMUX_SVIDEO ] ="S-Video" , [CX25821_VMUX_DEBUG ] ="for debug only" ,
@@ -1305,8 +1304,8 @@ int cx25821_vidioc_s_input(struct file *file, void *priv, unsigned int i)dprintk (1 ,"%s(%d)\n" , __func__, i);if (fh) { - err =v4l2_prio_check (&dev->channels[fh->channel_id] - .prio, fh->prio); + err =v4l2_prio_check (&dev->channels[fh->channel_id].prio, + fh->prio);if (0 != err)return err; }
Signature · 1 line
1.7.0.4
PATCH 27/44 Staging: cx25821: Change indent with spaces to tabs 23
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)
drivers/staging/cx25821/cx25821-video.c +13 -13
@@ -1358,14 +1358,14 @@ int cx25821_vidioc_s_frequency(struct file *file, void *priv,int err;if (fh) { - dev = fh->dev; - err =v4l2_prio_check (&dev->channels[fh->channel_id] - .prio, fh->prio); + dev = fh->dev; + err =v4l2_prio_check (&dev->channels[fh->channel_id].prio, + fh->prio);if (0 != err)return err; - }else { -pr_err ("Invalid fh pointer!\n" ); -return -EINVAL ; + }else { +pr_err ("Invalid fh pointer!\n" ); +return -EINVAL ; }return cx25821_set_freq (dev, f);
@@ -1427,8 +1427,8 @@ int cx25821_vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *t)int err;if (fh) { - err =v4l2_prio_check (&dev->channels[fh->channel_id] - .prio, fh->prio); + err =v4l2_prio_check (&dev->channels[fh->channel_id].prio, + fh->prio);if (0 != err)return err; }
@@ -1527,7 +1527,7 @@ int cx25821_vidioc_g_ctrl(struct file *file, void *priv, struct v4l2_control *ctl) {struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; -struct cx25821_fh *fh = priv; +struct cx25821_fh *fh = priv;const struct v4l2_queryctrl *ctrl;
@@ -1537,16 +1537,16 @@ int cx25821_vidioc_g_ctrl(struct file *file, void *priv,return -EINVAL ;switch (ctl->id) {case V4L2_CID_BRIGHTNESS : - ctl->value = dev->channels[fh->channel_id].ctl_bright; + ctl->value = dev->channels[fh->channel_id].ctl_bright;break ;case V4L2_CID_HUE : - ctl->value = dev->channels[fh->channel_id].ctl_hue; + ctl->value = dev->channels[fh->channel_id].ctl_hue;break ;case V4L2_CID_CONTRAST : - ctl->value = dev->channels[fh->channel_id].ctl_contrast; + ctl->value = dev->channels[fh->channel_id].ctl_contrast;break ;case V4L2_CID_SATURATION : - ctl->value = dev->channels[fh->channel_id].ctl_saturation; + ctl->value = dev->channels[fh->channel_id].ctl_saturation;break ; }return 0 ;
Signature · 1 line
1.7.0.4
PATCH 28/44 Staging: cx25821: Change indent with spaces to tabs 24
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/cx25821/cx25821-video.c +11 -11
@@ -1580,19 +1580,19 @@ int cx25821_set_control(struct cx25821_dev *dev,switch (ctl->id) {case V4L2_CID_BRIGHTNESS : - dev->channels[chan_num].ctl_bright = ctl->value; + dev->channels[chan_num].ctl_bright = ctl->value;medusa_set_brightness (dev, ctl->value, chan_num);break ;case V4L2_CID_HUE : - dev->channels[chan_num].ctl_hue = ctl->value; + dev->channels[chan_num].ctl_hue = ctl->value;medusa_set_hue (dev, ctl->value, chan_num);break ;case V4L2_CID_CONTRAST : - dev->channels[chan_num].ctl_contrast = ctl->value; + dev->channels[chan_num].ctl_contrast = ctl->value;medusa_set_contrast (dev, ctl->value, chan_num);break ;case V4L2_CID_SATURATION : - dev->channels[chan_num].ctl_saturation = ctl->value; + dev->channels[chan_num].ctl_saturation = ctl->value;medusa_set_saturation (dev, ctl->value, chan_num);break ; }
@@ -1625,9 +1625,9 @@ int cx25821_vidioc_cropcap(struct file *file, void *priv, cropcap->bounds.width =720 ; cropcap->bounds.height = dev->tvnorm ==V4L2_STD_PAL_BG ?576 :480 ; cropcap->pixelaspect.numerator = - dev->tvnorm ==V4L2_STD_PAL_BG ?59 :10 ; + dev->tvnorm ==V4L2_STD_PAL_BG ?59 :10 ; cropcap->pixelaspect.denominator = - dev->tvnorm ==V4L2_STD_PAL_BG ?54 :11 ; + dev->tvnorm ==V4L2_STD_PAL_BG ?54 :11 ; cropcap->defrect = cropcap->bounds;return 0 ; }
@@ -1639,24 +1639,24 @@ int cx25821_vidioc_s_crop(struct file *file, void *priv, struct v4l2_crop *crop)int err;if (fh) { - err =v4l2_prio_check (&dev->channels[fh->channel_id]. - prio, fh->prio); + err =v4l2_prio_check (&dev->channels[fh->channel_id].prio, + fh->prio);if (0 != err)return err; } -/* cx25821_vidioc_s_crop not supported */ +/* cx25821_vidioc_s_crop not supported */ return -EINVAL ; }int cx25821_vidioc_g_crop (struct file *file,void *priv,struct v4l2_crop *crop) { -/* cx25821_vidioc_g_crop not supported */ +/* cx25821_vidioc_g_crop not supported */ return -EINVAL ; }int cx25821_vidioc_querystd (struct file *file,void *priv,v4l2_std_id * norm) { -/* medusa does not support video standard sensing of current input */ +/* medusa does not support video standard sensing of current input */ *norm =CX25821_NORMS ;return 0 ;
Signature · 1 line
1.7.0.4
PATCH 29/44 Staging: cx25821: Change indent with spaces to tabs 25
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-)
drivers/staging/cx25821/cx25821-video.c +14 -15
@@ -1702,30 +1702,29 @@ int cx25821_is_valid_height(u32 height, v4l2_std_id tvnorm)static long video_ioctl_upstream9 (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; +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; + data_from_user = (struct upstream_user_struct *)arg;if (!data_from_user) {pr_err ("%s(): Upstream data is INVALID. Returning\n" , __func__);return 0 ; } - command = data_from_user->command; + command = data_from_user->command; -if (command !=UPSTREAM_START_VIDEO && - command !=UPSTREAM_STOP_VIDEO ) -return 0 ; +if (command !=UPSTREAM_START_VIDEO && command !=UPSTREAM_STOP_VIDEO ) +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; - dev->pixel_format = data_from_user->pixel_format; - dev->channel_select = data_from_user->channel_select; - dev->command = data_from_user->command; + dev->input_filename = data_from_user->input_filename; + dev->input_audiofilename = data_from_user->input_filename; + dev->vid_stdname = data_from_user->vid_stdname; + dev->pixel_format = data_from_user->pixel_format; + dev->channel_select = data_from_user->channel_select; + dev->command = data_from_user->command;switch (command) {case UPSTREAM_START_VIDEO :
Signature · 1 line
1.7.0.4
PATCH 30/44 Staging: cx25821: Change indent with spaces to tabs 26
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
drivers/staging/cx25821/cx25821-video.c +9 -9
@@ -1726,17 +1726,17 @@ static long video_ioctl_upstream9(struct file *file, unsigned int cmd, dev->channel_select = data_from_user->channel_select; dev->command = data_from_user->command; -switch (command) { -case UPSTREAM_START_VIDEO : -cx25821_start_upstream_video_ch1 (dev, data_from_user); -break ; +switch (command) { +case UPSTREAM_START_VIDEO : +cx25821_start_upstream_video_ch1 (dev, data_from_user); +break ; -case UPSTREAM_STOP_VIDEO : -cx25821_stop_upstream_video_ch1 (dev); -break ; - } +case UPSTREAM_STOP_VIDEO : +cx25821_stop_upstream_video_ch1 (dev); +break ; + } -return 0 ; +return 0 ; } static long video_ioctl_upstream10(struct file *file, unsigned int cmd,
Signature · 1 line
1.7.0.4
PATCH 31/44 Staging: cx25821: Change indent with spaces to tabs 27
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-)
drivers/staging/cx25821/cx25821-video.c +14 -15
@@ -1742,30 +1742,29 @@ static long video_ioctl_upstream9(struct file *file, unsigned int cmd,static long video_ioctl_upstream10 (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; +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; + data_from_user = (struct upstream_user_struct *)arg;if (!data_from_user) {pr_err ("%s(): Upstream data is INVALID. Returning\n" , __func__);return 0 ; } - command = data_from_user->command; + command = data_from_user->command; -if (command !=UPSTREAM_START_VIDEO && - command !=UPSTREAM_STOP_VIDEO ) -return 0 ; +if (command !=UPSTREAM_START_VIDEO && command !=UPSTREAM_STOP_VIDEO ) +return 0 ; - dev->input_filename_ch2 = data_from_user->input_filename; - dev->input_audiofilename = data_from_user->input_filename; - dev->vid_stdname_ch2 = data_from_user->vid_stdname; - dev->pixel_format_ch2 = data_from_user->pixel_format; - dev->channel_select_ch2 = data_from_user->channel_select; - dev->command_ch2 = data_from_user->command; + dev->input_filename_ch2 = data_from_user->input_filename; + dev->input_audiofilename = data_from_user->input_filename; + dev->vid_stdname_ch2 = data_from_user->vid_stdname; + dev->pixel_format_ch2 = data_from_user->pixel_format; + dev->channel_select_ch2 = data_from_user->channel_select; + dev->command_ch2 = data_from_user->command;switch (command) {case UPSTREAM_START_VIDEO :
Signature · 1 line
1.7.0.4
PATCH 32/44 Staging: cx25821: Change indent with spaces to tabs 28
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
drivers/staging/cx25821/cx25821-video.c +9 -9
@@ -1766,17 +1766,17 @@ static long video_ioctl_upstream10(struct file *file, unsigned int cmd, dev->channel_select_ch2 = data_from_user->channel_select; dev->command_ch2 = data_from_user->command; -switch (command) { -case UPSTREAM_START_VIDEO : -cx25821_start_upstream_video_ch2 (dev, data_from_user); -break ; +switch (command) { +case UPSTREAM_START_VIDEO : +cx25821_start_upstream_video_ch2 (dev, data_from_user); +break ; -case UPSTREAM_STOP_VIDEO : -cx25821_stop_upstream_video_ch2 (dev); -break ; - } +case UPSTREAM_STOP_VIDEO : +cx25821_stop_upstream_video_ch2 (dev); +break ; + } -return 0 ; +return 0 ; } static long video_ioctl_upstream11(struct file *file, unsigned int cmd,
Signature · 1 line
1.7.0.4
PATCH 33/44 Staging: cx25821: Change indent with spaces to tabs 29
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 47 +++++++++++++++---------------- 1 files changed, 23 insertions(+), 24 deletions(-)
drivers/staging/cx25821/cx25821-video.c +23 -24
@@ -1782,42 +1782,41 @@ static long video_ioctl_upstream10(struct file *file, unsigned int cmd,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; +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; + data_from_user = (struct upstream_user_struct *)arg;if (!data_from_user) {pr_err ("%s(): Upstream data is INVALID. Returning\n" , __func__);return 0 ; } - command = data_from_user->command; + command = data_from_user->command; -if (command !=UPSTREAM_START_AUDIO && - command !=UPSTREAM_STOP_AUDIO ) -return 0 ; +if (command !=UPSTREAM_START_AUDIO && command !=UPSTREAM_STOP_AUDIO ) +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; - dev->pixel_format = data_from_user->pixel_format; - dev->channel_select = data_from_user->channel_select; - dev->command = data_from_user->command; + dev->input_filename = data_from_user->input_filename; + dev->input_audiofilename = data_from_user->input_filename; + dev->vid_stdname = data_from_user->vid_stdname; + dev->pixel_format = data_from_user->pixel_format; + 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 ; +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_STOP_AUDIO : +cx25821_stop_upstream_audio (dev); +break ; + } -return 0 ; +return 0 ; } static long video_ioctl_set(struct file *file, unsigned int cmd,
Signature · 1 line
1.7.0.4
PATCH 34/44 Staging: cx25821: Change indent with spaces to tabs 30
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/cx25821/cx25821-video.c +11 -11
@@ -1822,25 +1822,25 @@ static long video_ioctl_upstream11(struct file *file, unsigned int cmd,static long video_ioctl_set (struct file *file,unsigned int cmd,unsigned long arg) { -struct cx25821_fh *fh = file->private_data; -struct cx25821_dev *dev = fh->dev; -struct downstream_user_struct *data_from_user; -int command; -int width =720 ; -int selected_channel =0 , pix_format =0 , i =0 ; -int cif_enable =0 , cif_width =0 ; -u32 value =0 ; +struct cx25821_fh *fh = file->private_data; +struct cx25821_dev *dev = fh->dev; +struct downstream_user_struct *data_from_user; +int command; +int width =720 ; +int selected_channel =0 , pix_format =0 , i =0 ; +int cif_enable =0 , cif_width =0 ; +u32 value =0 ; - data_from_user = (struct downstream_user_struct *)arg; + data_from_user = (struct downstream_user_struct *)arg;if (!data_from_user) {pr_err ("%s(): User data is INVALID. Returning\n" , __func__);return 0 ; } - command = data_from_user->command; + command = data_from_user->command; -if (command !=SET_VIDEO_STD && command !=SET_PIXEL_FORMAT +if (command !=SET_VIDEO_STD && command !=SET_PIXEL_FORMAT && command !=ENABLE_CIF_RESOLUTION && command !=REG_READ && command !=REG_WRITE && command !=MEDUSA_READ && command !=MEDUSA_WRITE ) {
Signature · 1 line
1.7.0.4
PATCH 35/44 Staging: cx25821: Change indent with spaces to tabs 31
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 37 +++++++++++++++---------------- 1 files changed, 18 insertions(+), 19 deletions(-)
drivers/staging/cx25821/cx25821-video.c +17 -18
@@ -1844,28 +1844,27 @@ static long video_ioctl_set(struct file *file, unsigned int cmd, && command != ENABLE_CIF_RESOLUTION && command != REG_READ && command != REG_WRITE && command != MEDUSA_READ && command != MEDUSA_WRITE) { -return 0 ; - } +return 0 ; + } -switch (command) { -case SET_VIDEO_STD : - dev->tvnorm = - !strcmp (data_from_user->vid_stdname, -"PAL" ) ?V4L2_STD_PAL_BG :V4L2_STD_NTSC_M ; -medusa_set_videostandard (dev); -break ; +switch (command) { +case SET_VIDEO_STD : + dev->tvnorm = !strcmp (data_from_user->vid_stdname,"PAL" ) ? +V4L2_STD_PAL_BG :V4L2_STD_NTSC_M ; +medusa_set_videostandard (dev); +break ; -case SET_PIXEL_FORMAT : - selected_channel = data_from_user->decoder_select; - pix_format = data_from_user->pixel_format; +case SET_PIXEL_FORMAT : + selected_channel = data_from_user->decoder_select; + pix_format = data_from_user->pixel_format; -if (!(selected_channel <=7 && selected_channel >=0 )) { - selected_channel -=4 ; - selected_channel = selected_channel %8 ; - } +if (!(selected_channel <=7 && selected_channel >=0 )) { + selected_channel -=4 ; + selected_channel = selected_channel %8 ; + } -if (selected_channel >=0 ) -cx25821_set_pixel_format (dev, selected_channel, +if (selected_channel >=0 ) +cx25821_set_pixel_format (dev, selected_channel, pix_format);break ;
Signature · 1 line
1.7.0.4
PATCH 36/44 Staging: cx25821: Change indent with spaces to tabs 32
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 113 +++++++++++++++---------------- 1 files changed, 56 insertions(+), 57 deletions(-)
drivers/staging/cx25821/cx25821-video.c +56 -57
@@ -1867,69 +1867,68 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,cx25821_set_pixel_format (dev, selected_channel, pix_format); -break ; - -case ENABLE_CIF_RESOLUTION : - selected_channel = data_from_user->decoder_select; - cif_enable = data_from_user->cif_resolution_enable; - cif_width = data_from_user->cif_width; - -if (cif_enable) { -if (dev->tvnorm &V4L2_STD_PAL_BG - || dev->tvnorm &V4L2_STD_PAL_DK ) - width =352 ; -else - width = (cif_width ==320 - || cif_width ==352 ) ? cif_width :320 ; - } - -if (!(selected_channel <=7 && selected_channel >=0 )) { - selected_channel -=4 ; - selected_channel = selected_channel %8 ; - } - -if (selected_channel <=7 && selected_channel >=0 ) { - dev->channels[selected_channel]. - use_cif_resolution = cif_enable; - dev->channels[selected_channel].cif_width = width; - }else { -for (i =0 ; i <VID_CHANNEL_NUM ; i++) { - dev->channels[i].use_cif_resolution = - cif_enable; - dev->channels[i].cif_width = width; - } - } - -medusa_set_resolution (dev, width, selected_channel); -break ; -case REG_READ : - data_from_user->reg_data =cx_read (data_from_user->reg_address); -break ; -case REG_WRITE : -cx_write (data_from_user->reg_address, data_from_user->reg_data); -break ; -case MEDUSA_READ : - value = -cx25821_i2c_read (&dev->i2c_bus[0 ], - (u16 ) data_from_user->reg_address, - &data_from_user->reg_data); -break ; -case MEDUSA_WRITE : -cx25821_i2c_write (&dev->i2c_bus[0 ], - (u16 ) data_from_user->reg_address, - data_from_user->reg_data); -break ; - } +break ; + +case ENABLE_CIF_RESOLUTION : + selected_channel = data_from_user->decoder_select; + cif_enable = data_from_user->cif_resolution_enable; + cif_width = data_from_user->cif_width; + +if (cif_enable) { +if (dev->tvnorm &V4L2_STD_PAL_BG + || dev->tvnorm &V4L2_STD_PAL_DK ) + width =352 ; +else + width = (cif_width ==320 || cif_width ==352 ) ? + cif_width :320 ; + } + +if (!(selected_channel <=7 && selected_channel >=0 )) { + selected_channel -=4 ; + selected_channel = selected_channel %8 ; + } + +if (selected_channel <=7 && selected_channel >=0 ) { + dev->channels[selected_channel]. + use_cif_resolution = cif_enable; + dev->channels[selected_channel].cif_width = width; + }else { +for (i =0 ; i <VID_CHANNEL_NUM ; i++) { + dev->channels[i].use_cif_resolution = + cif_enable; + dev->channels[i].cif_width = width; + } + } -return 0 ; +medusa_set_resolution (dev, width, selected_channel); +break ; +case REG_READ : + data_from_user->reg_data =cx_read (data_from_user->reg_address); +break ; +case REG_WRITE : +cx_write (data_from_user->reg_address, data_from_user->reg_data); +break ; +case MEDUSA_READ : + value =cx25821_i2c_read (&dev->i2c_bus[0 ], + (u16 ) data_from_user->reg_address, + &data_from_user->reg_data); +break ; +case MEDUSA_WRITE : +cx25821_i2c_write (&dev->i2c_bus[0 ], + (u16 ) data_from_user->reg_address, + data_from_user->reg_data); +break ; + } + +return 0 ; }static long cx25821_video_ioctl (struct file *file, -unsigned int cmd,unsigned long arg) +unsigned int cmd,unsigned long arg) { -int ret =0 ; +int ret =0 ; -struct cx25821_fh *fh = file->private_data; +struct cx25821_fh *fh = file->private_data;/* check to see if it's the video upstream */ if (fh->channel_id ==SRAM_CH09 ) {
Signature · 1 line
1.7.0.4
PATCH 37/44 Staging: cx25821: Change indent with spaces to tabs 33
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/staging/cx25821/cx25821-video.c +14 -14
@@ -1930,20 +1930,20 @@ static long cx25821_video_ioctl(struct file *file,struct cx25821_fh *fh = file->private_data; -/* check to see if it's the video upstream */ -if (fh->channel_id ==SRAM_CH09 ) { - ret =video_ioctl_upstream9 (file, cmd, arg); -return ret; - }else if (fh->channel_id ==SRAM_CH10 ) { - ret =video_ioctl_upstream10 (file, cmd, arg); -return ret; - }else if (fh->channel_id ==SRAM_CH11 ) { - ret =video_ioctl_upstream11 (file, cmd, arg); - ret =video_ioctl_set (file, cmd, arg); -return ret; - } - -return video_ioctl2 (file, cmd, arg); +/* check to see if it's the video upstream */ +if (fh->channel_id ==SRAM_CH09 ) { + ret =video_ioctl_upstream9 (file, cmd, arg); +return ret; + }else if (fh->channel_id ==SRAM_CH10 ) { + ret =video_ioctl_upstream10 (file, cmd, arg); +return ret; + }else if (fh->channel_id ==SRAM_CH11 ) { + ret =video_ioctl_upstream11 (file, cmd, arg); + ret =video_ioctl_set (file, cmd, arg); +return ret; + } + +return video_ioctl2 (file, cmd, arg); }/* exported stuff */
Signature · 1 line
1.7.0.4
PATCH 38/44 Staging: cx25821: Change indent with spaces to tabs 34
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 76 +++++++++++++++--------------- 1 files changed, 38 insertions(+), 38 deletions(-)
drivers/staging/cx25821/cx25821-video.c +38 -38
@@ -1948,52 +1948,52 @@ static long cx25821_video_ioctl(struct file *file,/* exported stuff */ static const struct v4l2_file_operations video_fops = { - .owner =THIS_MODULE , - .open = video_open, - .release = video_release, - .read = video_read, - .poll = video_poll, - .mmap = cx25821_video_mmap, - .ioctl = cx25821_video_ioctl, + .owner =THIS_MODULE , + .open = video_open, + .release = video_release, + .read = video_read, + .poll = video_poll, + .mmap = cx25821_video_mmap, + .ioctl = cx25821_video_ioctl, };static const struct v4l2_ioctl_ops video_ioctl_ops = { - .vidioc_querycap = cx25821_vidioc_querycap, - .vidioc_enum_fmt_vid_cap = cx25821_vidioc_enum_fmt_vid_cap, - .vidioc_g_fmt_vid_cap = cx25821_vidioc_g_fmt_vid_cap, - .vidioc_try_fmt_vid_cap = cx25821_vidioc_try_fmt_vid_cap, - .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, - .vidioc_reqbufs = cx25821_vidioc_reqbufs, - .vidioc_querybuf = cx25821_vidioc_querybuf, - .vidioc_qbuf = cx25821_vidioc_qbuf, - .vidioc_dqbuf = vidioc_dqbuf, + .vidioc_querycap = cx25821_vidioc_querycap, + .vidioc_enum_fmt_vid_cap = cx25821_vidioc_enum_fmt_vid_cap, + .vidioc_g_fmt_vid_cap = cx25821_vidioc_g_fmt_vid_cap, + .vidioc_try_fmt_vid_cap = cx25821_vidioc_try_fmt_vid_cap, + .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, + .vidioc_reqbufs = cx25821_vidioc_reqbufs, + .vidioc_querybuf = cx25821_vidioc_querybuf, + .vidioc_qbuf = cx25821_vidioc_qbuf, + .vidioc_dqbuf = vidioc_dqbuf, #ifdef TUNER_FLAG - .vidioc_s_std = cx25821_vidioc_s_std, - .vidioc_querystd = cx25821_vidioc_querystd, + .vidioc_s_std = cx25821_vidioc_s_std, + .vidioc_querystd = cx25821_vidioc_querystd, #endif - .vidioc_cropcap = cx25821_vidioc_cropcap, - .vidioc_s_crop = cx25821_vidioc_s_crop, - .vidioc_g_crop = cx25821_vidioc_g_crop, - .vidioc_enum_input = cx25821_vidioc_enum_input, - .vidioc_g_input = cx25821_vidioc_g_input, - .vidioc_s_input = cx25821_vidioc_s_input, - .vidioc_g_ctrl = cx25821_vidioc_g_ctrl, - .vidioc_s_ctrl = vidioc_s_ctrl, - .vidioc_queryctrl = cx25821_vidioc_queryctrl, - .vidioc_streamon = vidioc_streamon, - .vidioc_streamoff = vidioc_streamoff, - .vidioc_log_status = vidioc_log_status, - .vidioc_g_priority = cx25821_vidioc_g_priority, - .vidioc_s_priority = cx25821_vidioc_s_priority, + .vidioc_cropcap = cx25821_vidioc_cropcap, + .vidioc_s_crop = cx25821_vidioc_s_crop, + .vidioc_g_crop = cx25821_vidioc_g_crop, + .vidioc_enum_input = cx25821_vidioc_enum_input, + .vidioc_g_input = cx25821_vidioc_g_input, + .vidioc_s_input = cx25821_vidioc_s_input, + .vidioc_g_ctrl = cx25821_vidioc_g_ctrl, + .vidioc_s_ctrl = vidioc_s_ctrl, + .vidioc_queryctrl = cx25821_vidioc_queryctrl, + .vidioc_streamon = vidioc_streamon, + .vidioc_streamoff = vidioc_streamoff, + .vidioc_log_status = vidioc_log_status, + .vidioc_g_priority = cx25821_vidioc_g_priority, + .vidioc_s_priority = cx25821_vidioc_s_priority, #ifdef TUNER_FLAG - .vidioc_g_tuner = cx25821_vidioc_g_tuner, - .vidioc_s_tuner = cx25821_vidioc_s_tuner, - .vidioc_g_frequency = cx25821_vidioc_g_frequency, - .vidioc_s_frequency = cx25821_vidioc_s_frequency, + .vidioc_g_tuner = cx25821_vidioc_g_tuner, + .vidioc_s_tuner = cx25821_vidioc_s_tuner, + .vidioc_g_frequency = cx25821_vidioc_g_frequency, + .vidioc_s_frequency = cx25821_vidioc_s_frequency, #endif #ifdef CONFIG_VIDEO_ADV_DEBUG - .vidioc_g_register = cx25821_vidioc_g_register, - .vidioc_s_register = cx25821_vidioc_s_register, + .vidioc_g_register = cx25821_vidioc_g_register, + .vidioc_s_register = cx25821_vidioc_s_register, #endif };
Signature · 1 line
1.7.0.4
PATCH 39/44 Staging: cx25821: Change indent with spaces to tabs 35
In reply to Leonid V. FedorenchikChange indent with spaces to tabs.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/cx25821/cx25821-video.c +5 -5
@@ -1998,9 +1998,9 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { };struct video_device cx25821_videoioctl_template = { - .name ="cx25821-videoioctl" , - .fops = &video_fops, - .ioctl_ops = &video_ioctl_ops, - .tvnorms =CX25821_NORMS , - .current_norm =V4L2_STD_NTSC_M , + .name ="cx25821-videoioctl" , + .fops = &video_fops, + .ioctl_ops = &video_ioctl_ops, + .tvnorms =CX25821_NORMS , + .current_norm =V4L2_STD_NTSC_M , };
Signature · 1 line
1.7.0.4
PATCH 40/44 Staging: cx25821: Fix braces around statements in cx25821-video.c
In reply to Leonid V. FedorenchikDelete braces around single statements.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
drivers/staging/cx25821/cx25821-video.c +2 -4
@@ -98,9 +98,8 @@ struct cx25821_fmt *cx25821_format_by_fourcc(unsigned int fourcc) {unsigned int i; -if (fourcc ==V4L2_PIX_FMT_Y41P || fourcc ==V4L2_PIX_FMT_YUV411P ) { +if (fourcc ==V4L2_PIX_FMT_Y41P || fourcc ==V4L2_PIX_FMT_YUV411P )return formats +1 ; - }for (i =0 ; i <ARRAY_SIZE (formats); i++)if (formats[i].fourcc == fourcc)
@@ -147,9 +146,8 @@ void cx25821_video_wakeup(struct cx25821_dev *dev, struct cx25821_dmaqueue *q,/* count comes from the hw and it is 16bit wide -- * this trick handles wrap-arounds correctly for * up to 32767 buffers in flight... */ -if ((s16) (count - buf->count) <0 ) { +if ((s16) (count - buf->count) <0 )break ; - }do_gettimeofday (&buf->vb.ts); buf->vb.state =VIDEOBUF_DONE ;
Signature · 1 line
1.7.0.4
PATCH 41/44 Staging: cx25821: Replace :? by if-else in cx25821-video.c
In reply to Leonid V. FedorenchikReplace :? operator by equivalent if-else statement where in improves readability. Don't add else branch if it is not needed.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.c | 32 +++++++++++++++++++----------- 1 files changed, 20 insertions(+), 12 deletions(-)
drivers/staging/cx25821/cx25821-video.c +20 -12
@@ -599,8 +599,8 @@ int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,if (init_buffer) { channel_opened = dev->channel_opened; - channel_opened = (channel_opened <0 - || channel_opened >7 ) ?7 : channel_opened; +if (channel_opened <0 || channel_opened >7 ) + channel_opened =7 ;if (dev->channels[channel_opened].pixel_formats ==PIXEL_FRMT_411 )
@@ -840,8 +840,10 @@ static int video_open(struct file *file) fh->height =480 ; dev->channel_opened = fh->channel_id; - pix_format = (dev->channels[ch_id].pixel_formats ==PIXEL_FRMT_411 ) ? -V4L2_PIX_FMT_Y41P :V4L2_PIX_FMT_YUYV ; +if (dev->channels[ch_id].pixel_formats ==PIXEL_FRMT_411 ) + pix_format =V4L2_PIX_FMT_Y41P ; +else + pix_format =V4L2_PIX_FMT_YUYV ; fh->fmt =cx25821_format_by_fourcc (pix_format);v4l2_prio_open (&dev->channels[ch_id].prio, &fh->prio);
@@ -1124,8 +1126,10 @@ int cx25821_vidioc_try_fmt_vid_cap(struct file *file, void *priv, maxh =576 ;if (V4L2_FIELD_ANY == field) { - field = (f->fmt.pix.height > maxh /2 ) - ?V4L2_FIELD_INTERLACED :V4L2_FIELD_TOP ; +if (f->fmt.pix.height > maxh /2 ) + field =V4L2_FIELD_INTERLACED ; +else + field =V4L2_FIELD_TOP ; }switch (field) {
@@ -1847,8 +1851,10 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,switch (command) {case SET_VIDEO_STD : - dev->tvnorm = !strcmp (data_from_user->vid_stdname,"PAL" ) ? -V4L2_STD_PAL_BG :V4L2_STD_NTSC_M ; +if (!strcmp (data_from_user->vid_stdname,"PAL" )) + dev->tvnorm =V4L2_STD_PAL_BG ; +else + dev->tvnorm =V4L2_STD_NTSC_M ;medusa_set_videostandard (dev);break ;
@@ -1874,11 +1880,13 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,if (cif_enable) {if (dev->tvnorm &V4L2_STD_PAL_BG - || dev->tvnorm &V4L2_STD_PAL_DK ) + || dev->tvnorm &V4L2_STD_PAL_DK ) { width =352 ; -else - width = (cif_width ==320 || cif_width ==352 ) ? - cif_width :320 ; + }else { + width = cif_width; +if (cif_width !=320 && cif_width !=352 ) + width =320 ; + } }if (!(selected_channel <=7 && selected_channel >=0 )) {
Signature · 1 line
1.7.0.4
PATCH 42/44 Staging: cx25821: cx25821-video.h: Line up constant
In reply to Leonid V. FedorenchikLine up integer constant with others.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/cx25821/cx25821-video.h +1 -1
@@ -63,7 +63,7 @@ do { \#define REG_READ 900#define REG_WRITE 901#define MEDUSA_READ 910 -#define MEDUSA_WRITE 911 +#define MEDUSA_WRITE 911extern struct sram_channel *channel0;extern struct sram_channel *channel1;
Signature · 1 line
1.7.0.4
PATCH 43/44 Staging: cx25821: cx25821-video.h: Fix indent
In reply to Leonid V. FedorenchikFix indent of function arguments.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.h | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/cx25821/cx25821-video.h +15 -15
@@ -87,7 +87,7 @@ extern struct cx25821_fmt *cx25821_format_by_fourcc(unsigned int fourcc);extern struct cx25821_data timeout_data[MAX_VID_CHANNEL_NUM ];extern void cx25821_dump_video_queue (struct cx25821_dev *dev, -struct cx25821_dmaqueue *q); +struct cx25821_dmaqueue *q);extern void cx25821_video_wakeup (struct cx25821_dev *dev,struct cx25821_dmaqueue *q,u32 count);
@@ -96,11 +96,11 @@ extern int cx25821_set_tvnorm(struct cx25821_dev *dev, v4l2_std_id norm);#endif extern int cx25821_res_get (struct cx25821_dev *dev,struct cx25821_fh *fh, -unsigned int bit); +unsigned int bit);extern int cx25821_res_check (struct cx25821_fh *fh,unsigned int bit);extern int cx25821_res_locked (struct cx25821_fh *fh,unsigned int bit);extern void cx25821_res_free (struct cx25821_dev *dev,struct cx25821_fh *fh, -unsigned int bits); +unsigned int bits);extern int cx25821_video_mux (struct cx25821_dev *dev,unsigned int input); extern int cx25821_start_video_dma(struct cx25821_dev *dev, struct cx25821_dmaqueue *q,
@@ -119,18 +119,18 @@ extern int cx25821_buffer_setup(struct videobuf_queue *q, unsigned int *count,extern int cx25821_buffer_prepare (struct videobuf_queue *q,struct videobuf_buffer *vb,enum v4l2_field field);extern void cx25821_buffer_release (struct videobuf_queue *q, -struct videobuf_buffer *vb); +struct videobuf_buffer *vb);extern struct videobuf_queue *get_queue (struct cx25821_fh *fh);extern int cx25821_get_resource (struct cx25821_fh *fh,int resource);extern int cx25821_video_mmap (struct file *file,struct vm_area_struct *vma);extern int cx25821_vidioc_try_fmt_vid_cap (struct file *file,void *priv, -struct v4l2_format *f); +struct v4l2_format *f);extern int cx25821_vidioc_querycap (struct file *file,void *priv, -struct v4l2_capability *cap); +struct v4l2_capability *cap);extern int cx25821_vidioc_enum_fmt_vid_cap (struct file *file,void *priv, -struct v4l2_fmtdesc *f); +struct v4l2_fmtdesc *f);extern int cx25821_vidioc_reqbufs (struct file *file,void *priv, -struct v4l2_requestbuffers *p); +struct v4l2_requestbuffers *p);extern int cx25821_vidioc_querybuf (struct file *file,void *priv,struct v4l2_buffer *p);extern int cx25821_vidioc_qbuf (struct file *file,void *priv,struct v4l2_buffer *p);
@@ -141,16 +141,16 @@ extern int cx25821_vidioc_enum_input(struct file *file, void *priv,extern int cx25821_vidioc_g_input (struct file *file,void *priv,unsigned int *i);extern int cx25821_vidioc_s_input (struct file *file,void *priv,unsigned int i);extern int cx25821_vidioc_g_ctrl (struct file *file,void *priv, -struct v4l2_control *ctl); +struct v4l2_control *ctl);extern int cx25821_vidioc_g_fmt_vid_cap (struct file *file,void *priv, -struct v4l2_format *f); +struct v4l2_format *f);extern int cx25821_vidioc_g_frequency (struct file *file,void *priv, -struct v4l2_frequency *f); +struct v4l2_frequency *f);extern int cx25821_set_freq (struct cx25821_dev *dev,struct v4l2_frequency *f);extern int cx25821_vidioc_s_frequency (struct file *file,void *priv, -struct v4l2_frequency *f); +struct v4l2_frequency *f);extern int cx25821_vidioc_g_register (struct file *file,void *fh, -struct v4l2_dbg_register *reg); +struct v4l2_dbg_register *reg);extern int cx25821_vidioc_s_register (struct file *file,void *fh,struct v4l2_dbg_register *reg);extern int cx25821_vidioc_g_tuner (struct file *file,void *priv,struct v4l2_tuner *t);
@@ -161,10 +161,10 @@ extern int cx25821_is_valid_height(u32 height, v4l2_std_id tvnorm);extern int cx25821_vidioc_g_priority (struct file *file,void *f,enum v4l2_priority *p);extern int cx25821_vidioc_s_priority (struct file *file,void *f, -enum v4l2_priority prio); +enum v4l2_priority prio);extern int cx25821_vidioc_queryctrl (struct file *file,void *priv, -struct v4l2_queryctrl *qctrl); +struct v4l2_queryctrl *qctrl);extern int cx25821_set_control (struct cx25821_dev *dev,struct v4l2_control *ctrl,int chan_num);
Signature · 1 line
1.7.0.4
PATCH 44/44 Staging: cx25821: cx25821-video.h: Fix long lines
In reply to Leonid V. FedorenchikFix long function prototypes and line up arguments nicely.
Signed-off-by Leonid V. Fedorenchik <[email protected]>
--- drivers/staging/cx25821/cx25821-video.h | 47 +++++++++++++++++++------------ 1 files changed, 29 insertions(+), 18 deletions(-)
drivers/staging/cx25821/cx25821-video.h +29 -18
@@ -115,9 +115,10 @@ extern int cx25821_video_register(struct cx25821_dev *dev);extern int cx25821_get_format_size (void );extern int cx25821_buffer_setup (struct videobuf_queue *q,unsigned int *count, -unsigned int *size); -extern int cx25821_buffer_prepare (struct videobuf_queue *q,struct videobuf_buffer *vb, -enum v4l2_field field); +unsigned int *size); +extern int cx25821_buffer_prepare (struct videobuf_queue *q, +struct videobuf_buffer *vb, +enum v4l2_field field);extern void cx25821_buffer_release (struct videobuf_queue *q,struct videobuf_buffer *vb);extern struct videobuf_queue *get_queue (struct cx25821_fh *fh);
@@ -132,14 +133,18 @@ extern int cx25821_vidioc_enum_fmt_vid_cap(struct file *file, void *priv,extern int cx25821_vidioc_reqbufs (struct file *file,void *priv,struct v4l2_requestbuffers *p);extern int cx25821_vidioc_querybuf (struct file *file,void *priv, -struct v4l2_buffer *p); -extern int cx25821_vidioc_qbuf (struct file *file,void *priv,struct v4l2_buffer *p); -extern int cx25821_vidioc_s_std (struct file *file,void *priv,v4l2_std_id * tvnorms); +struct v4l2_buffer *p); +extern int cx25821_vidioc_qbuf (struct file *file,void *priv, +struct v4l2_buffer *p); +extern int cx25821_vidioc_s_std (struct file *file,void *priv, +v4l2_std_id *tvnorms);extern int cx25821_enum_input (struct cx25821_dev *dev,struct v4l2_input *i);extern int cx25821_vidioc_enum_input (struct file *file,void *priv, -struct v4l2_input *i); -extern int cx25821_vidioc_g_input (struct file *file,void *priv,unsigned int *i); -extern int cx25821_vidioc_s_input (struct file *file,void *priv,unsigned int i); +struct v4l2_input *i); +extern int cx25821_vidioc_g_input (struct file *file,void *priv, +unsigned int *i); +extern int cx25821_vidioc_s_input (struct file *file,void *priv, +unsigned int i);extern int cx25821_vidioc_g_ctrl (struct file *file,void *priv,struct v4l2_control *ctl); extern int cx25821_vidioc_g_fmt_vid_cap(struct file *file, void *priv,
@@ -152,14 +157,17 @@ extern int cx25821_vidioc_s_frequency(struct file *file, void *priv,extern int cx25821_vidioc_g_register (struct file *file,void *fh,struct v4l2_dbg_register *reg);extern int cx25821_vidioc_s_register (struct file *file,void *fh, -struct v4l2_dbg_register *reg); -extern int cx25821_vidioc_g_tuner (struct file *file,void *priv,struct v4l2_tuner *t); -extern int cx25821_vidioc_s_tuner (struct file *file,void *priv,struct v4l2_tuner *t); +struct v4l2_dbg_register *reg); +extern int cx25821_vidioc_g_tuner (struct file *file,void *priv, +struct v4l2_tuner *t); +extern int cx25821_vidioc_s_tuner (struct file *file,void *priv, +struct v4l2_tuner *t);extern int cx25821_is_valid_width (u32 width,v4l2_std_id tvnorm);extern int cx25821_is_valid_height (u32 height,v4l2_std_id tvnorm); -extern int cx25821_vidioc_g_priority (struct file *file,void *f,enum v4l2_priority *p); +extern int cx25821_vidioc_g_priority (struct file *file,void *f, +enum v4l2_priority *p);extern int cx25821_vidioc_s_priority (struct file *file,void *f,enum v4l2_priority prio);
@@ -169,9 +177,12 @@ extern int cx25821_set_control(struct cx25821_dev *dev, struct v4l2_control *ctrl, int chan_num);extern int cx25821_vidioc_cropcap (struct file *file,void *fh, -struct v4l2_cropcap *cropcap); -extern int cx25821_vidioc_s_crop (struct file *file,void *priv,struct v4l2_crop *crop); -extern int cx25821_vidioc_g_crop (struct file *file,void *priv,struct v4l2_crop *crop); - -extern int cx25821_vidioc_querystd (struct file *file,void *priv,v4l2_std_id * norm); +struct v4l2_cropcap *cropcap); +extern int cx25821_vidioc_s_crop (struct file *file,void *priv, +struct v4l2_crop *crop); +extern int cx25821_vidioc_g_crop (struct file *file,void *priv, +struct v4l2_crop *crop); + +extern int cx25821_vidioc_querystd (struct file *file,void *priv, +v4l2_std_id *norm);#endif
Signature · 1 line
1.7.0.4
Quoted 14 lines · Leonid V. Fedorenchik
This patch series fixes up style issues in cx25821-video.{c,h} files in
drivers/staging/cx25821What the heck with patches 5-39? ... Well, in
cx25821-video.cfile there are lots of lines starting with 7 spaces where clearly this intented to be a tab; that is reported by checkpatch.pl script. And even more lines that start with one or more tabs and 7 spaces; this is intented to be 2 or more tabs instead and this is not reported by checkpatch.pl script (obviously). So, first, I fix up all that kind of wrong indents and resulting patch was too big and unreviewable. (around 2K lines) So, since I haven't thought of better way to make the patch reviewable, I decided to split that huge patch into small reviewable patches. The result is 35 patches. %-) If you can think of a better way to deal with this, let me know.
Looks good, all now applied, thanks.
greg k-h