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/via-camera.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/via-camera.c')
-rw-r--r-- | drivers/media/platform/via-camera.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c index a794cd6c4441..e3438277b80b 100644 --- a/drivers/media/platform/via-camera.c +++ b/drivers/media/platform/via-camera.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/videodev2.h> | 17 | #include <linux/videodev2.h> |
18 | #include <media/v4l2-device.h> | 18 | #include <media/v4l2-device.h> |
19 | #include <media/v4l2-ioctl.h> | 19 | #include <media/v4l2-ioctl.h> |
20 | #include <media/v4l2-chip-ident.h> | ||
21 | #include <media/v4l2-ctrls.h> | 20 | #include <media/v4l2-ctrls.h> |
22 | #include <media/ov7670.h> | 21 | #include <media/ov7670.h> |
23 | #include <media/videobuf-dma-sg.h> | 22 | #include <media/videobuf-dma-sg.h> |
@@ -805,20 +804,6 @@ static const struct v4l2_file_operations viacam_fops = { | |||
805 | * The long list of v4l2 ioctl ops | 804 | * The long list of v4l2 ioctl ops |
806 | */ | 805 | */ |
807 | 806 | ||
808 | static int viacam_g_chip_ident(struct file *file, void *priv, | ||
809 | struct v4l2_dbg_chip_ident *ident) | ||
810 | { | ||
811 | struct via_camera *cam = priv; | ||
812 | |||
813 | ident->ident = V4L2_IDENT_NONE; | ||
814 | ident->revision = 0; | ||
815 | if (v4l2_chip_match_host(&ident->match)) { | ||
816 | ident->ident = V4L2_IDENT_VIA_VX855; | ||
817 | return 0; | ||
818 | } | ||
819 | return sensor_call(cam, core, g_chip_ident, ident); | ||
820 | } | ||
821 | |||
822 | /* | 807 | /* |
823 | * Only one input. | 808 | * Only one input. |
824 | */ | 809 | */ |
@@ -1174,7 +1159,6 @@ static int viacam_enum_frameintervals(struct file *filp, void *priv, | |||
1174 | 1159 | ||
1175 | 1160 | ||
1176 | static const struct v4l2_ioctl_ops viacam_ioctl_ops = { | 1161 | static const struct v4l2_ioctl_ops viacam_ioctl_ops = { |
1177 | .vidioc_g_chip_ident = viacam_g_chip_ident, | ||
1178 | .vidioc_enum_input = viacam_enum_input, | 1162 | .vidioc_enum_input = viacam_enum_input, |
1179 | .vidioc_g_input = viacam_g_input, | 1163 | .vidioc_g_input = viacam_g_input, |
1180 | .vidioc_s_input = viacam_s_input, | 1164 | .vidioc_s_input = viacam_s_input, |