[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: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 543631c3557ab94ec264164532403d33b0eb5497..19a034e79be4d15fdfd3a1104aff1dadc902849f 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -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;

diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 5860292d42ebdf491e08bb21d583a1361b433786..b052184512e265b10dffb4720b6cb31324cc3904 100644 (file)
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -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,