diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-06-03 04:36:46 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 08:35:56 -0400 |
commit | 9c1f5df81300b89c5c5c76b101502dad3977fdcb (patch) | |
tree | fe32b788ffd09f403d79eb488140de5580b924cf /drivers/media/pci/cx23885 | |
parent | 8d2d41e92d99e25f7d42fc83fc39096d89caa35e (diff) |
[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')
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-417.c | 5 | ||||
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-video.c | 7 |
2 files changed, 3 insertions, 9 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) | |||
1217 | struct cx23885_fh *fh = file->private_data; | 1217 | struct cx23885_fh *fh = file->private_data; |
1218 | struct cx23885_dev *dev = fh->dev; | 1218 | struct cx23885_dev *dev = fh->dev; |
1219 | 1219 | ||
1220 | call_all(dev, core, g_std, id); | 1220 | *id = dev->tvnorm; |
1221 | |||
1222 | return 0; | 1221 | return 0; |
1223 | } | 1222 | } |
1224 | 1223 | ||
@@ -1661,7 +1660,6 @@ static struct v4l2_file_operations mpeg_fops = { | |||
1661 | }; | 1660 | }; |
1662 | 1661 | ||
1663 | static const struct v4l2_ioctl_ops mpeg_ioctl_ops = { | 1662 | static const struct v4l2_ioctl_ops mpeg_ioctl_ops = { |
1664 | .vidioc_querystd = vidioc_g_std, | ||
1665 | .vidioc_g_std = vidioc_g_std, | 1663 | .vidioc_g_std = vidioc_g_std, |
1666 | .vidioc_s_std = vidioc_s_std, | 1664 | .vidioc_s_std = vidioc_s_std, |
1667 | .vidioc_enum_input = vidioc_enum_input, | 1665 | .vidioc_enum_input = vidioc_enum_input, |
@@ -1702,7 +1700,6 @@ static struct video_device cx23885_mpeg_template = { | |||
1702 | .fops = &mpeg_fops, | 1700 | .fops = &mpeg_fops, |
1703 | .ioctl_ops = &mpeg_ioctl_ops, | 1701 | .ioctl_ops = &mpeg_ioctl_ops, |
1704 | .tvnorms = CX23885_NORMS, | 1702 | .tvnorms = CX23885_NORMS, |
1705 | .current_norm = V4L2_STD_NTSC_M, | ||
1706 | }; | 1703 | }; |
1707 | 1704 | ||
1708 | void cx23885_417_unregister(struct cx23885_dev *dev) | 1705 | void cx23885_417_unregister(struct cx23885_dev *dev) |
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c index ce057398c632..e33d1a7dfdd0 100644 --- a/drivers/media/pci/cx23885/cx23885-video.c +++ b/drivers/media/pci/cx23885/cx23885-video.c | |||
@@ -1254,8 +1254,7 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id) | |||
1254 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; | 1254 | struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; |
1255 | dprintk(1, "%s()\n", __func__); | 1255 | dprintk(1, "%s()\n", __func__); |
1256 | 1256 | ||
1257 | call_all(dev, core, g_std, id); | 1257 | *id = dev->tvnorm; |
1258 | |||
1259 | return 0; | 1258 | return 0; |
1260 | } | 1259 | } |
1261 | 1260 | ||
@@ -1743,7 +1742,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { | |||
1743 | .vidioc_dqbuf = vidioc_dqbuf, | 1742 | .vidioc_dqbuf = vidioc_dqbuf, |
1744 | .vidioc_s_std = vidioc_s_std, | 1743 | .vidioc_s_std = vidioc_s_std, |
1745 | .vidioc_g_std = vidioc_g_std, | 1744 | .vidioc_g_std = vidioc_g_std, |
1746 | .vidioc_querystd = vidioc_g_std, | ||
1747 | .vidioc_enum_input = vidioc_enum_input, | 1745 | .vidioc_enum_input = vidioc_enum_input, |
1748 | .vidioc_g_input = vidioc_g_input, | 1746 | .vidioc_g_input = vidioc_g_input, |
1749 | .vidioc_s_input = vidioc_s_input, | 1747 | .vidioc_s_input = vidioc_s_input, |
@@ -1773,7 +1771,6 @@ static struct video_device cx23885_video_template = { | |||
1773 | .fops = &video_fops, | 1771 | .fops = &video_fops, |
1774 | .ioctl_ops = &video_ioctl_ops, | 1772 | .ioctl_ops = &video_ioctl_ops, |
1775 | .tvnorms = CX23885_NORMS, | 1773 | .tvnorms = CX23885_NORMS, |
1776 | .current_norm = V4L2_STD_NTSC_M, | ||
1777 | }; | 1774 | }; |
1778 | 1775 | ||
1779 | static const struct v4l2_file_operations radio_fops = { | 1776 | static const struct v4l2_file_operations radio_fops = { |
@@ -1822,7 +1819,7 @@ int cx23885_video_register(struct cx23885_dev *dev) | |||
1822 | cx23885_vbi_template = cx23885_video_template; | 1819 | cx23885_vbi_template = cx23885_video_template; |
1823 | strcpy(cx23885_vbi_template.name, "cx23885-vbi"); | 1820 | strcpy(cx23885_vbi_template.name, "cx23885-vbi"); |
1824 | 1821 | ||
1825 | dev->tvnorm = cx23885_video_template.current_norm; | 1822 | dev->tvnorm = V4L2_STD_NTSC_M; |
1826 | 1823 | ||
1827 | /* init video dma queues */ | 1824 | /* init video dma queues */ |
1828 | INIT_LIST_HEAD(&dev->vidq.active); | 1825 | INIT_LIST_HEAD(&dev->vidq.active); |