diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-09-03 11:18:23 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-09-08 17:00:57 +0400 |
| commit | 1d54b3a43cd1228dc90dcd331eb735f79e3b021e (patch) | |
| tree | a23092935b36ea23fb2cfc2bb3c909e6f1817f9a /drivers/media/platform/vivid/vivid-vid-out.c | |
| parent | 751e78d0f5c3e90203682b6acc2a5cdf447a646d (diff) | |
| download | linux-1d54b3a43cd1228dc90dcd331eb735f79e3b021e.tar.xz | |
[media] vivid: remove duplicate and unused g/s_edid functions
I'm not sure how I missed this, but they should be removed.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/vivid/vivid-vid-out.c')
| -rw-r--r-- | drivers/media/platform/vivid/vivid-vid-out.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c index 8ed9f6d9f505..d0e0e955b3de 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -1113,63 +1113,6 @@ int vivid_vid_out_s_dv_timings(struct file *file, void *_fh, return 0; } -#if 0 -int vivid_vid_out_g_edid(struct file *file, void *_fh, - struct v4l2_edid *edid) -{ - struct vivid_dev *dev = video_drvdata(file); - struct video_device *vdev = video_devdata(file); - - memset(edid->reserved, 0, sizeof(edid->reserved)); - if (vdev->vfl_dir == VFL_DIR_RX) { - if (edid->pad >= dev->num_inputs) - return -EINVAL; - if (dev->input_type[edid->pad] != HDMI) - return -EINVAL; - } else { - if (edid->pad >= dev->num_outputs) - return -EINVAL; - if (dev->output_type[edid->pad] != HDMI) - return -EINVAL; - } - if (edid->start_block == 0 && edid->blocks == 0) { - edid->blocks = dev->edid_blocks; - return 0; - } - if (dev->edid_blocks == 0) - return -ENODATA; - if (edid->start_block >= dev->edid_blocks) - return -EINVAL; - if (edid->start_block + edid->blocks > dev->edid_blocks) - edid->blocks = dev->edid_blocks - edid->start_block; - memcpy(edid->edid, dev->edid, edid->blocks * 128); - return 0; -} - -int vivid_vid_out_s_edid(struct file *file, void *_fh, - struct v4l2_edid *edid) -{ - struct vivid_dev *dev = video_drvdata(file); - - memset(edid->reserved, 0, sizeof(edid->reserved)); - if (edid->pad >= dev->num_inputs) - return -EINVAL; - if (dev->input_type[edid->pad] != HDMI || edid->start_block) - return -EINVAL; - if (edid->blocks == 0) { - dev->edid_blocks = 0; - return 0; - } - if (edid->blocks > dev->edid_max_blocks) { - edid->blocks = dev->edid_max_blocks; - return -E2BIG; - } - dev->edid_blocks = edid->blocks; - memcpy(dev->edid, edid->edid, edid->blocks * 128); - return 0; -} -#endif - int vivid_vid_out_g_parm(struct file *file, void *priv, struct v4l2_streamparm *parm) { |