Commit ed3e2749 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-ioctl: remove unused vidioc_g/s_crop 



Now that all drivers have dropped vidioc_g/s_crop we can remove
support for them in the V4L2 core.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Tested-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent f72b9d8c

drivers/media/v4l2-core/v4l2-dev.c

+2 −2
Original line number Diff line number Diff line
@@ -635,9 +635,9 @@ static void determine_valid_ioctls(struct video_device *vdev) 
		SET_VALID_IOCTL(ops, VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd);

		SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMESIZES, vidioc_enum_framesizes);

		SET_VALID_IOCTL(ops, VIDIOC_ENUM_FRAMEINTERVALS, vidioc_enum_frameintervals);

		if (ops->vidioc_g_crop || ops->vidioc_g_selection)

		if (ops->vidioc_g_selection)

			set_bit(_IOC_NR(VIDIOC_G_CROP), valid_ioctls);

		if (ops->vidioc_s_crop || ops->vidioc_s_selection)

		if (ops->vidioc_s_selection)

			set_bit(_IOC_NR(VIDIOC_S_CROP), valid_ioctls);

		SET_VALID_IOCTL(ops, VIDIOC_G_SELECTION, vidioc_g_selection);

		SET_VALID_IOCTL(ops, VIDIOC_S_SELECTION, vidioc_s_selection);

drivers/media/v4l2-core/v4l2-ioctl.c

+0 −4
Original line number Diff line number Diff line
@@ -2209,8 +2209,6 @@ static int v4l_g_crop(const struct v4l2_ioctl_ops *ops, 
	};

	int ret;



	if (ops->vidioc_g_crop)

		return ops->vidioc_g_crop(file, fh, p);

	/* simulate capture crop using selection api */



	/* crop means compose for output devices */
@@ -2241,8 +2239,6 @@ static int v4l_s_crop(const struct v4l2_ioctl_ops *ops, 
		.r = p->c,

	};



	if (ops->vidioc_s_crop)

		return ops->vidioc_s_crop(file, fh, p);

	/* simulate capture crop using selection api */



	/* crop means compose for output devices */

include/media/v4l2-ioctl.h

+0 −8
Original line number Diff line number Diff line
@@ -222,10 +222,6 @@ struct v4l2_fh; 
 *	:ref:`VIDIOC_S_MODULATOR <vidioc_g_modulator>` ioctl

 * @vidioc_cropcap: pointer to the function that implements

 *	:ref:`VIDIOC_CROPCAP <vidioc_cropcap>` ioctl

 * @vidioc_g_crop: pointer to the function that implements

 *	:ref:`VIDIOC_G_CROP <vidioc_g_crop>` ioctl

 * @vidioc_s_crop: pointer to the function that implements

 *	:ref:`VIDIOC_S_CROP <vidioc_g_crop>` ioctl

 * @vidioc_g_selection: pointer to the function that implements

 *	:ref:`VIDIOC_G_SELECTION <vidioc_g_selection>` ioctl

 * @vidioc_s_selection: pointer to the function that implements
@@ -493,10 +489,6 @@ struct v4l2_ioctl_ops { 
	/* Crop ioctls */

	int (*vidioc_cropcap)(struct file *file, void *fh,

			      struct v4l2_cropcap *a);

	int (*vidioc_g_crop)(struct file *file, void *fh,

			     struct v4l2_crop *a);

	int (*vidioc_s_crop)(struct file *file, void *fh,

			     const struct v4l2_crop *a);

	int (*vidioc_g_selection)(struct file *file, void *fh,

				  struct v4l2_selection *s);

	int (*vidioc_s_selection)(struct file *file, void *fh,

CRA Git | Maintained and supported by SUSTech CRA and CCSE