V4L: soc-camera: remove now unused soc-camera .enum_input() operation

Commit Message

Guennadi Liakhovetski June 6, 2011, 5:22 p.m. UTC

Also this functionality should be implemented, if needed, using the
v4l2-subdev API.

Signed-off-by: Guennadi Liakhovetski <[e-mail]>
---
 drivers/media/video/soc_camera.c |   13 ++++---------
 include/media/soc_camera.h       |    1 -
 2 files changed, 4 insertions(+), 10 deletions(-)

Patch

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 3988643..faf1e6c 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -199,20 +199,15 @@  static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv,
 static int soc_camera_enum_input(struct file *file, void *priv,
 				 struct v4l2_input *inp)
 {
-	struct soc_camera_device *icd = file->private_data;
 	int ret = 0;
 
 	if (inp->index != 0)
 		return -EINVAL;
 
-	if (icd->ops->enum_input)
-		ret = icd->ops->enum_input(icd, inp);
-	else {
-		/* default is camera */
-		inp->type = V4L2_INPUT_TYPE_CAMERA;
-		inp->std  = V4L2_STD_UNKNOWN;
-		strcpy(inp->name, "Camera");
-	}
+	/* default is camera */
+	inp->type = V4L2_INPUT_TYPE_CAMERA;
+	inp->std  = V4L2_STD_UNKNOWN;
+	strcpy(inp->name, "Camera");
 
 	return ret;
 }
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 790f422..5a26d4e 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -206,7 +206,6 @@  struct soc_camera_ops {
 	int (*resume)(struct soc_camera_device *);
 	unsigned long (*query_bus_param)(struct soc_camera_device *);
 	int (*set_bus_param)(struct soc_camera_device *, unsigned long);
-	int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);
 	const struct v4l2_queryctrl *controls;
 	int num_controls;
 };