Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] v4l2-subdev: drop get/set_crop pad ops 



Drop the duplicate get/set_crop pad ops and only use get/set_selection.
It makes no sense to have two duplicate ops in the internal subdev API.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1a023feb

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

+0 −8
Original line number Diff line number Diff line
@@ -283,10 +283,6 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) 
		if (rval)

			return rval;



		rval = v4l2_subdev_call(sd, pad, get_crop, subdev_fh, crop);

		if (rval != -ENOIOCTLCMD)

			return rval;



		memset(&sel, 0, sizeof(sel));

		sel.which = crop->which;

		sel.pad = crop->pad;
@@ -308,10 +304,6 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) 
		if (rval)

			return rval;



		rval = v4l2_subdev_call(sd, pad, set_crop, subdev_fh, crop);

		if (rval != -ENOIOCTLCMD)

			return rval;



		memset(&sel, 0, sizeof(sel));

		sel.which = crop->which;

		sel.pad = crop->pad;

include/media/v4l2-subdev.h

+0 −4
Original line number Diff line number Diff line
@@ -503,10 +503,6 @@ struct v4l2_subdev_pad_ops { 
		       struct v4l2_subdev_format *format);

	int (*set_fmt)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,

		       struct v4l2_subdev_format *format);

	int (*set_crop)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,

		       struct v4l2_subdev_crop *crop);

	int (*get_crop)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,

		       struct v4l2_subdev_crop *crop);

	int (*get_selection)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,

			     struct v4l2_subdev_selection *sel);

	int (*set_selection)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,