diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-06-03 12:36:46 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 16:35:56 +0400 |
| commit | 9c1f5df81300b89c5c5c76b101502dad3977fdcb (patch) | |
| tree | fe32b788ffd09f403d79eb488140de5580b924cf /drivers/media/pci/cx23885/cx23885-417.c | |
| parent | 8d2d41e92d99e25f7d42fc83fc39096d89caa35e (diff) | |
| download | linux-9c1f5df81300b89c5c5c76b101502dad3977fdcb.tar.xz | |
[media] cx23885: remove use of deprecated current_norm
The use of current_norm can be dropped. The g_std ioctl was already
implemented, so current_norm didn't do anything useful anyway.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885-417.c')
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885-417.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c index 68568d35a692..f4f9ef0d98e2 100644 --- a/drivers/media/pci/cx23885/cx23885-417.c +++ b/drivers/media/pci/cx23885/cx23885-417.c @@ -1217,8 +1217,7 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id) struct cx23885_fh *fh = file->private_data; struct cx23885_dev *dev = fh->dev; - call_all(dev, core, g_std, id); - + *id = dev->tvnorm; return 0; } @@ -1661,7 +1660,6 @@ static struct v4l2_file_operations mpeg_fops = { }; static const struct v4l2_ioctl_ops mpeg_ioctl_ops = { - .vidioc_querystd = vidioc_g_std, .vidioc_g_std = vidioc_g_std, .vidioc_s_std = vidioc_s_std, .vidioc_enum_input = vidioc_enum_input, @@ -1702,7 +1700,6 @@ static struct video_device cx23885_mpeg_template = { .fops = &mpeg_fops, .ioctl_ops = &mpeg_ioctl_ops, .tvnorms = CX23885_NORMS, - .current_norm = V4L2_STD_NTSC_M, }; void cx23885_417_unregister(struct cx23885_dev *dev) |