[media] v4l2: remove g/s_crop from video ops

Replace all calls to g/s_crop by calls to the get/set_selection pad ops.

Remove the old g/s_crop video ops since they are now no longer used.

The cropcap video op is now only used to pass pixelaspect information,
and is only needed if the pixelaspect is not 1:1.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

2 files changed, 2 insertions, 11 deletions

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 97aa13314bfd..1a15c3e4efd3 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -105,16 +105,13 @@ struct soc_camera_host_ops {
         int (*get_formats)(struct soc_camera_device *, unsigned int,
                            struct soc_camera_format_xlate *);
         void (*put_formats)(struct soc_camera_device *);
-        int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *);
-        int (*get_crop)(struct soc_camera_device *, struct v4l2_crop *);
-        int (*set_crop)(struct soc_camera_device *, const struct v4l2_crop *);
         int (*get_selection)(struct soc_camera_device *, struct v4l2_selection *);
         int (*set_selection)(struct soc_camera_device *, struct v4l2_selection *);
         /*
-         * The difference to .set_crop() is, that .set_livecrop is not allowed
+         * The difference to .set_selection() is, that .set_liveselection is not allowed
          * to change the output sizes
          */
-        int (*set_livecrop)(struct soc_camera_device *, const struct v4l2_crop *);
+        int (*set_liveselection)(struct soc_camera_device *, struct v4l2_selection *);
         int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);
         int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
         void (*init_videobuf)(struct videobuf_queue *,
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 2a2240c99b30..22ea819ada95 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -360,10 +360,6 @@ struct v4l2_mbus_frame_desc {
  *
  * @cropcap: callback for %VIDIOC_CROPCAP ioctl handler code.
  *
- * @g_crop: callback for %VIDIOC_G_CROP ioctl handler code.
- *
- * @s_crop: callback for %VIDIOC_S_CROP ioctl handler code.
- *
  * @g_parm: callback for %VIDIOC_G_PARM ioctl handler code.
  *
  * @s_parm: callback for %VIDIOC_S_PARM ioctl handler code.
@@ -403,8 +399,6 @@ struct v4l2_subdev_video_ops {
         int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
         int (*s_stream)(struct v4l2_subdev *sd, int enable);
         int (*cropcap)(struct v4l2_subdev *sd, struct v4l2_cropcap *cc);
-        int (*g_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
-        int (*s_crop)(struct v4l2_subdev *sd, const struct v4l2_crop *crop);
         int (*g_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
         int (*s_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
         int (*g_frame_interval)(struct v4l2_subdev *sd,