aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-01 07:30:06 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-01 07:30:06 -0400
commit90874cd61d5f5260714fc1b5728a3fbb28348b53 (patch)
tree3a6c9ec548373f10ad1864f60c8050ed9fda8ba6
parent7c89a21b88e6a07e1be811508f381673f498bc8a (diff)
dt3155: fix CodingStyle issues
There are a few lines longer than 80 cols for no good reason. Fix them sooner than latter, making checkpatch.pl happy. Cc: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/pci/dt3155/dt3155.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/media/pci/dt3155/dt3155.c b/drivers/media/pci/dt3155/dt3155.c
index 586c446a7054..89d0dc705e4a 100644
--- a/drivers/media/pci/dt3155/dt3155.c
+++ b/drivers/media/pci/dt3155/dt3155.c
@@ -303,7 +303,8 @@ static const struct v4l2_file_operations dt3155_fops = {
303 .poll = vb2_fop_poll 303 .poll = vb2_fop_poll
304}; 304};
305 305
306static int dt3155_querycap(struct file *filp, void *p, struct v4l2_capability *cap) 306static int dt3155_querycap(struct file *filp, void *p,
307 struct v4l2_capability *cap)
307{ 308{
308 struct dt3155_priv *pd = video_drvdata(filp); 309 struct dt3155_priv *pd = video_drvdata(filp);
309 310
@@ -316,7 +317,8 @@ static int dt3155_querycap(struct file *filp, void *p, struct v4l2_capability *c
316 return 0; 317 return 0;
317} 318}
318 319
319static int dt3155_enum_fmt_vid_cap(struct file *filp, void *p, struct v4l2_fmtdesc *f) 320static int dt3155_enum_fmt_vid_cap(struct file *filp,
321 void *p, struct v4l2_fmtdesc *f)
320{ 322{
321 if (f->index) 323 if (f->index)
322 return -EINVAL; 324 return -EINVAL;
@@ -368,12 +370,14 @@ static int dt3155_s_std(struct file *filp, void *p, v4l2_std_id norm)
368 return 0; 370 return 0;
369} 371}
370 372
371static int dt3155_enum_input(struct file *filp, void *p, struct v4l2_input *input) 373static int dt3155_enum_input(struct file *filp, void *p,
374 struct v4l2_input *input)
372{ 375{
373 if (input->index > 3) 376 if (input->index > 3)
374 return -EINVAL; 377 return -EINVAL;
375 if (input->index) 378 if (input->index)
376 snprintf(input->name, sizeof(input->name), "VID%d", input->index); 379 snprintf(input->name, sizeof(input->name), "VID%d",
380 input->index);
377 else 381 else
378 strlcpy(input->name, "J2/VID0", sizeof(input->name)); 382 strlcpy(input->name, "J2/VID0", sizeof(input->name));
379 input->type = V4L2_INPUT_TYPE_CAMERA; 383 input->type = V4L2_INPUT_TYPE_CAMERA;
@@ -594,7 +598,8 @@ err_v4l2_dev_unreg:
594static void dt3155_remove(struct pci_dev *pdev) 598static void dt3155_remove(struct pci_dev *pdev)
595{ 599{
596 struct v4l2_device *v4l2_dev = pci_get_drvdata(pdev); 600 struct v4l2_device *v4l2_dev = pci_get_drvdata(pdev);
597 struct dt3155_priv *pd = container_of(v4l2_dev, struct dt3155_priv, v4l2_dev); 601 struct dt3155_priv *pd = container_of(v4l2_dev, struct dt3155_priv,
602 v4l2_dev);
598 603
599 video_unregister_device(&pd->vdev); 604 video_unregister_device(&pd->vdev);
600 free_irq(pd->pdev->irq, pd); 605 free_irq(pd->pdev->irq, pd);