aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/saa7164/saa7164-encoder.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-29 05:59:35 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 07:36:35 -0400
commitabca2056dc3dd0d813ba2f8b013e98cf009ba168 (patch)
tree6da342f2892b662291d686e45d83269e4c8921d5 /drivers/media/pci/saa7164/saa7164-encoder.c
parent191b79b0883cb0e604ba63fb3f85cf50ecfc9dc3 (diff)
[media] v4l2: remove g_chip_ident from bridge drivers where it is easy to do so
VIDIOC_DBG_G_CHIP_IDENT has been replaced by VIDIOC_DBG_G_CHIP_INFO. Remove g_chip_ident support from bridge drivers since it is no longer needed. This patch takes care of all the trivial cases. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Acked-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/saa7164/saa7164-encoder.c')
-rw-r--r--drivers/media/pci/saa7164/saa7164-encoder.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/media/pci/saa7164/saa7164-encoder.c b/drivers/media/pci/saa7164/saa7164-encoder.c
index 63a72fb71f30..e4f53a55eab1 100644
--- a/drivers/media/pci/saa7164/saa7164-encoder.c
+++ b/drivers/media/pci/saa7164/saa7164-encoder.c
@@ -1288,38 +1288,6 @@ static const struct v4l2_file_operations mpeg_fops = {
1288 .unlocked_ioctl = video_ioctl2, 1288 .unlocked_ioctl = video_ioctl2,
1289}; 1289};
1290 1290
1291static int saa7164_g_chip_ident(struct file *file, void *fh,
1292 struct v4l2_dbg_chip_ident *chip)
1293{
1294 struct saa7164_port *port = ((struct saa7164_encoder_fh *)fh)->port;
1295 struct saa7164_dev *dev = port->dev;
1296 dprintk(DBGLVL_ENC, "%s()\n", __func__);
1297
1298 return 0;
1299}
1300
1301#ifdef CONFIG_VIDEO_ADV_DEBUG
1302static int saa7164_g_register(struct file *file, void *fh,
1303 struct v4l2_dbg_register *reg)
1304{
1305 struct saa7164_port *port = ((struct saa7164_encoder_fh *)fh)->port;
1306 struct saa7164_dev *dev = port->dev;
1307 dprintk(DBGLVL_ENC, "%s()\n", __func__);
1308
1309 return 0;
1310}
1311
1312static int saa7164_s_register(struct file *file, void *fh,
1313 const struct v4l2_dbg_register *reg)
1314{
1315 struct saa7164_port *port = ((struct saa7164_encoder_fh *)fh)->port;
1316 struct saa7164_dev *dev = port->dev;
1317 dprintk(DBGLVL_ENC, "%s()\n", __func__);
1318
1319 return 0;
1320}
1321#endif
1322
1323static const struct v4l2_ioctl_ops mpeg_ioctl_ops = { 1291static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
1324 .vidioc_s_std = vidioc_s_std, 1292 .vidioc_s_std = vidioc_s_std,
1325 .vidioc_enum_input = vidioc_enum_input, 1293 .vidioc_enum_input = vidioc_enum_input,
@@ -1340,11 +1308,6 @@ static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
1340 .vidioc_s_ext_ctrls = vidioc_s_ext_ctrls, 1308 .vidioc_s_ext_ctrls = vidioc_s_ext_ctrls,
1341 .vidioc_try_ext_ctrls = vidioc_try_ext_ctrls, 1309 .vidioc_try_ext_ctrls = vidioc_try_ext_ctrls,
1342 .vidioc_queryctrl = vidioc_queryctrl, 1310 .vidioc_queryctrl = vidioc_queryctrl,
1343 .vidioc_g_chip_ident = saa7164_g_chip_ident,
1344#ifdef CONFIG_VIDEO_ADV_DEBUG
1345 .vidioc_g_register = saa7164_g_register,
1346 .vidioc_s_register = saa7164_s_register,
1347#endif
1348}; 1311};
1349 1312
1350static struct video_device saa7164_mpeg_template = { 1313static struct video_device saa7164_mpeg_template = {