[media] V4L: soc-camera: remove several now unused soc-camera client operations (8318a64b) · Commits · 戴 / test

This patch removes .enum_input(), .suspend() and .resume() soc-camera client operations. Functionality, provided by .enum_input(), if needed, can be implemented using the v4l2-subdev API. As for .suspend() and .resume(), the only client driver, implementing these methods has been mt9m111, and the only host driver, using them has been pxa-camera. Now that both those drivers have been converted to the standard subdev .s_power() operation, .suspend() and .resume() can be removed. Signed-off-by:

Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by:

Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/video/soc_camera.c

+5 −12

Original line number	Diff line number	Diff line
		@@ -199,22 +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");
		}

		return ret;
		return 0;
		}

		static int soc_camera_g_input(struct file file, void priv, unsigned int *i)

include/media/soc_camera.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -201,11 +201,8 @@ struct soc_camera_format_xlate {
		};

		struct soc_camera_ops {
		int (suspend)(struct soc_camera_device , pm_message_t state);
		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;
		};

Admin message