diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-11-13 08:35:38 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-19 10:11:18 -0500 |
commit | 71d5e7af12894497882b0497f331b6a2b6c97d23 (patch) | |
tree | 98174a1636f8bfe98e50a94b4df69f566e00d6c6 | |
parent | 05ad6fc1d54f106d5b8c598e2f9b59b12f3fb476 (diff) |
[media] omap_vout: Drop overlay format enumeration
Enumerating formats for output overlays doesn't make sense, as the pixel
format is defined by the display API, not the V4L2 API. Drop the
vidioc_enum_fmt_vid_overlay ioctl operation.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/platform/omap/omap_vout.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index 837cb6db747f..90f890875b8b 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c | |||
@@ -1232,21 +1232,6 @@ static int vidioc_s_fmt_vid_overlay(struct file *file, void *fh, | |||
1232 | return ret; | 1232 | return ret; |
1233 | } | 1233 | } |
1234 | 1234 | ||
1235 | static int vidioc_enum_fmt_vid_overlay(struct file *file, void *fh, | ||
1236 | struct v4l2_fmtdesc *fmt) | ||
1237 | { | ||
1238 | int index = fmt->index; | ||
1239 | |||
1240 | if (index >= NUM_OUTPUT_FORMATS) | ||
1241 | return -EINVAL; | ||
1242 | |||
1243 | fmt->flags = omap_formats[index].flags; | ||
1244 | strlcpy(fmt->description, omap_formats[index].description, | ||
1245 | sizeof(fmt->description)); | ||
1246 | fmt->pixelformat = omap_formats[index].pixelformat; | ||
1247 | return 0; | ||
1248 | } | ||
1249 | |||
1250 | static int vidioc_g_fmt_vid_overlay(struct file *file, void *fh, | 1235 | static int vidioc_g_fmt_vid_overlay(struct file *file, void *fh, |
1251 | struct v4l2_format *f) | 1236 | struct v4l2_format *f) |
1252 | { | 1237 | { |
@@ -1862,7 +1847,6 @@ static const struct v4l2_ioctl_ops vout_ioctl_ops = { | |||
1862 | .vidioc_s_ctrl = vidioc_s_ctrl, | 1847 | .vidioc_s_ctrl = vidioc_s_ctrl, |
1863 | .vidioc_try_fmt_vid_overlay = vidioc_try_fmt_vid_overlay, | 1848 | .vidioc_try_fmt_vid_overlay = vidioc_try_fmt_vid_overlay, |
1864 | .vidioc_s_fmt_vid_overlay = vidioc_s_fmt_vid_overlay, | 1849 | .vidioc_s_fmt_vid_overlay = vidioc_s_fmt_vid_overlay, |
1865 | .vidioc_enum_fmt_vid_overlay = vidioc_enum_fmt_vid_overlay, | ||
1866 | .vidioc_g_fmt_vid_overlay = vidioc_g_fmt_vid_overlay, | 1850 | .vidioc_g_fmt_vid_overlay = vidioc_g_fmt_vid_overlay, |
1867 | .vidioc_cropcap = vidioc_cropcap, | 1851 | .vidioc_cropcap = vidioc_cropcap, |
1868 | .vidioc_g_crop = vidioc_g_crop, | 1852 | .vidioc_g_crop = vidioc_g_crop, |