diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-05-29 05:59:35 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 07:36:35 -0400 |
commit | abca2056dc3dd0d813ba2f8b013e98cf009ba168 (patch) | |
tree | 6da342f2892b662291d686e45d83269e4c8921d5 /drivers/media/platform/sh_vou.c | |
parent | 191b79b0883cb0e604ba63fb3f85cf50ecfc9dc3 (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/platform/sh_vou.c')
-rw-r--r-- | drivers/media/platform/sh_vou.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c index 7d0235069c87..fa8ae7241521 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c | |||
@@ -1248,32 +1248,6 @@ static unsigned int sh_vou_poll(struct file *file, poll_table *wait) | |||
1248 | return res; | 1248 | return res; |
1249 | } | 1249 | } |
1250 | 1250 | ||
1251 | static int sh_vou_g_chip_ident(struct file *file, void *fh, | ||
1252 | struct v4l2_dbg_chip_ident *id) | ||
1253 | { | ||
1254 | struct sh_vou_device *vou_dev = video_drvdata(file); | ||
1255 | |||
1256 | return v4l2_device_call_until_err(&vou_dev->v4l2_dev, 0, core, g_chip_ident, id); | ||
1257 | } | ||
1258 | |||
1259 | #ifdef CONFIG_VIDEO_ADV_DEBUG | ||
1260 | static int sh_vou_g_register(struct file *file, void *fh, | ||
1261 | struct v4l2_dbg_register *reg) | ||
1262 | { | ||
1263 | struct sh_vou_device *vou_dev = video_drvdata(file); | ||
1264 | |||
1265 | return v4l2_device_call_until_err(&vou_dev->v4l2_dev, 0, core, g_register, reg); | ||
1266 | } | ||
1267 | |||
1268 | static int sh_vou_s_register(struct file *file, void *fh, | ||
1269 | const struct v4l2_dbg_register *reg) | ||
1270 | { | ||
1271 | struct sh_vou_device *vou_dev = video_drvdata(file); | ||
1272 | |||
1273 | return v4l2_device_call_until_err(&vou_dev->v4l2_dev, 0, core, s_register, reg); | ||
1274 | } | ||
1275 | #endif | ||
1276 | |||
1277 | /* sh_vou display ioctl operations */ | 1251 | /* sh_vou display ioctl operations */ |
1278 | static const struct v4l2_ioctl_ops sh_vou_ioctl_ops = { | 1252 | static const struct v4l2_ioctl_ops sh_vou_ioctl_ops = { |
1279 | .vidioc_querycap = sh_vou_querycap, | 1253 | .vidioc_querycap = sh_vou_querycap, |
@@ -1292,11 +1266,6 @@ static const struct v4l2_ioctl_ops sh_vou_ioctl_ops = { | |||
1292 | .vidioc_cropcap = sh_vou_cropcap, | 1266 | .vidioc_cropcap = sh_vou_cropcap, |
1293 | .vidioc_g_crop = sh_vou_g_crop, | 1267 | .vidioc_g_crop = sh_vou_g_crop, |
1294 | .vidioc_s_crop = sh_vou_s_crop, | 1268 | .vidioc_s_crop = sh_vou_s_crop, |
1295 | .vidioc_g_chip_ident = sh_vou_g_chip_ident, | ||
1296 | #ifdef CONFIG_VIDEO_ADV_DEBUG | ||
1297 | .vidioc_g_register = sh_vou_g_register, | ||
1298 | .vidioc_s_register = sh_vou_s_register, | ||
1299 | #endif | ||
1300 | }; | 1269 | }; |
1301 | 1270 | ||
1302 | static const struct v4l2_file_operations sh_vou_fops = { | 1271 | static const struct v4l2_file_operations sh_vou_fops = { |