diff options
| author | Hans Verkuil | 2012-06-22 10:49:33 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2012-07-06 22:32:24 +0200 |
| commit | 4e1d2ac63368843d63dc38ed42f141506bd1e988 (patch) | |
| tree | 8b8aacd860ced9f6d8d6ad91695bfa0e8e957b4e /drivers/media/video/vivi.c | |
| parent | [media] videobuf2-core: add helper functions (diff) | |
| download | kernel-qcow2-linux-4e1d2ac63368843d63dc38ed42f141506bd1e988.tar.gz kernel-qcow2-linux-4e1d2ac63368843d63dc38ed42f141506bd1e988.tar.xz kernel-qcow2-linux-4e1d2ac63368843d63dc38ed42f141506bd1e988.zip | |
[media] vivi: remove pointless g/s_std support
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vivi.c')
| -rw-r--r-- | drivers/media/video/vivi.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 08c10240e70f..e00efcf02571 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c @@ -1072,11 +1072,6 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i) return vb2_streamoff(&dev->vb_vidq, i); } -static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *i) -{ - return 0; -} - /* only one input in this sample driver */ static int vidioc_enum_input(struct file *file, void *priv, struct v4l2_input *inp) @@ -1085,7 +1080,6 @@ static int vidioc_enum_input(struct file *file, void *priv, return -EINVAL; inp->type = V4L2_INPUT_TYPE_CAMERA; - inp->std = V4L2_STD_525_60; sprintf(inp->name, "Camera %u", inp->index); return 0; } @@ -1318,7 +1312,6 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = { .vidioc_querybuf = vidioc_querybuf, .vidioc_qbuf = vidioc_qbuf, .vidioc_dqbuf = vidioc_dqbuf, - .vidioc_s_std = vidioc_s_std, .vidioc_enum_input = vidioc_enum_input, .vidioc_g_input = vidioc_g_input, .vidioc_s_input = vidioc_s_input, @@ -1334,9 +1327,6 @@ static struct video_device vivi_template = { .fops = &vivi_fops, .ioctl_ops = &vivi_ioctl_ops, .release = video_device_release, - - .tvnorms = V4L2_STD_525_60, - .current_norm = V4L2_STD_NTSC_M, }; /* ----------------------------------------------------------------- |