summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-01 08:30:06 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-01 08:30:06 -0300
commit90874cd61d5f5260714fc1b5728a3fbb28348b53 (patch)
tree3a6c9ec548373f10ad1864f60c8050ed9fda8ba6 /drivers/media
parent7c89a21b88e6a07e1be811508f381673f498bc8a (diff)
downloadlwn-90874cd61d5f5260714fc1b5728a3fbb28348b53.tar.gz
lwn-90874cd61d5f5260714fc1b5728a3fbb28348b53.zip
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>
Diffstat (limited to 'drivers/media')
-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 = {
.poll = vb2_fop_poll
};
-static int dt3155_querycap(struct file *filp, void *p, struct v4l2_capability *cap)
+static int dt3155_querycap(struct file *filp, void *p,
+ struct v4l2_capability *cap)
{
struct dt3155_priv *pd = video_drvdata(filp);
@@ -316,7 +317,8 @@ static int dt3155_querycap(struct file *filp, void *p, struct v4l2_capability *c
return 0;
}
-static int dt3155_enum_fmt_vid_cap(struct file *filp, void *p, struct v4l2_fmtdesc *f)
+static int dt3155_enum_fmt_vid_cap(struct file *filp,
+ void *p, struct v4l2_fmtdesc *f)
{
if (f->index)
return -EINVAL;
@@ -368,12 +370,14 @@ static int dt3155_s_std(struct file *filp, void *p, v4l2_std_id norm)
return 0;
}
-static int dt3155_enum_input(struct file *filp, void *p, struct v4l2_input *input)
+static int dt3155_enum_input(struct file *filp, void *p,
+ struct v4l2_input *input)
{
if (input->index > 3)
return -EINVAL;
if (input->index)
- snprintf(input->name, sizeof(input->name), "VID%d", input->index);
+ snprintf(input->name, sizeof(input->name), "VID%d",
+ input->index);
else
strlcpy(input->name, "J2/VID0", sizeof(input->name));
input->type = V4L2_INPUT_TYPE_CAMERA;
@@ -594,7 +598,8 @@ err_v4l2_dev_unreg:
static void dt3155_remove(struct pci_dev *pdev)
{
struct v4l2_device *v4l2_dev = pci_get_drvdata(pdev);
- struct dt3155_priv *pd = container_of(v4l2_dev, struct dt3155_priv, v4l2_dev);
+ struct dt3155_priv *pd = container_of(v4l2_dev, struct dt3155_priv,
+ v4l2_dev);
video_unregister_device(&pd->vdev);
free_irq(pd->pdev->irq, pd);