diff options
author | Mats Randgaard <mats.randgaard@cisco.com> | 2010-12-16 10:17:45 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-19 08:28:19 -0500 |
commit | 2c0ddd17741383009c53cf557d6526848c8bb917 (patch) | |
tree | 7c2aa63013f664743a8f3046362912c894384d19 /drivers/media/video/davinci/vpif_display.c | |
parent | c027e165d2d901ecab485da5fee72ddce5da0297 (diff) |
[media] vpif_cap/disp: Cleanup, improved comments
Signed-off-by: Mats Randgaard <mats.randgaard@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Murali Karicheri <mkaricheri@gmail.com>
Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Acked-by: Manjunath Hadli <manjunath.hadli@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/davinci/vpif_display.c')
-rw-r--r-- | drivers/media/video/davinci/vpif_display.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c index 44a885878ebf..7cb70d916f4b 100644 --- a/drivers/media/video/davinci/vpif_display.c +++ b/drivers/media/video/davinci/vpif_display.c | |||
@@ -580,7 +580,10 @@ static void vpif_config_addr(struct channel_obj *ch, int muxmode) | |||
580 | static int vpif_mmap(struct file *filep, struct vm_area_struct *vma) | 580 | static int vpif_mmap(struct file *filep, struct vm_area_struct *vma) |
581 | { | 581 | { |
582 | struct vpif_fh *fh = filep->private_data; | 582 | struct vpif_fh *fh = filep->private_data; |
583 | struct common_obj *common = &fh->channel->common[VPIF_VIDEO_INDEX]; | 583 | struct channel_obj *ch = fh->channel; |
584 | struct common_obj *common = &(ch->common[VPIF_VIDEO_INDEX]); | ||
585 | |||
586 | vpif_dbg(2, debug, "vpif_mmap\n"); | ||
584 | 587 | ||
585 | return videobuf_mmap_mapper(&common->buffer_queue, vma); | 588 | return videobuf_mmap_mapper(&common->buffer_queue, vma); |
586 | } | 589 | } |
@@ -692,7 +695,12 @@ static int vpif_release(struct file *filep) | |||
692 | } | 695 | } |
693 | 696 | ||
694 | /* functions implementing ioctls */ | 697 | /* functions implementing ioctls */ |
695 | 698 | /** | |
699 | * vpif_querycap() - QUERYCAP handler | ||
700 | * @file: file ptr | ||
701 | * @priv: file handle | ||
702 | * @cap: ptr to v4l2_capability structure | ||
703 | */ | ||
696 | static int vpif_querycap(struct file *file, void *priv, | 704 | static int vpif_querycap(struct file *file, void *priv, |
697 | struct v4l2_capability *cap) | 705 | struct v4l2_capability *cap) |
698 | { | 706 | { |
@@ -1106,7 +1114,7 @@ static int vpif_streamon(struct file *file, void *priv, | |||
1106 | if (ret < 0) | 1114 | if (ret < 0) |
1107 | return ret; | 1115 | return ret; |
1108 | 1116 | ||
1109 | /* Call videobuf_streamon to start streaming in videobuf */ | 1117 | /* Call videobuf_streamon to start streaming in videobuf */ |
1110 | ret = videobuf_streamon(&common->buffer_queue); | 1118 | ret = videobuf_streamon(&common->buffer_queue); |
1111 | if (ret < 0) { | 1119 | if (ret < 0) { |
1112 | vpif_err("videobuf_streamon\n"); | 1120 | vpif_err("videobuf_streamon\n"); |
@@ -1873,6 +1881,8 @@ static __init int vpif_probe(struct platform_device *pdev) | |||
1873 | vpif_obj.sd[i]->grp_id = 1 << i; | 1881 | vpif_obj.sd[i]->grp_id = 1 << i; |
1874 | } | 1882 | } |
1875 | 1883 | ||
1884 | v4l2_info(&vpif_obj.v4l2_dev, | ||
1885 | "DM646x VPIF display driver initialized\n"); | ||
1876 | return 0; | 1886 | return 0; |
1877 | 1887 | ||
1878 | probe_subdev_out: | 1888 | probe_subdev_out: |