media: i2c: imx219: switch to {enable,disable}_streams

Switch from s_stream to enable_streams and disable_streams callbacks.

Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
index 04262bbf6306d8b9dcc0942a20ad51edda7bc3b5..1b4eb531b3155e63cd7ea06516878f289881e8d8 100644 (file)
--- a/drivers/media/i2c/imx219.c
+++ b/drivers/media/i2c/imx219.c
@@ -718,9 +718,11 @@ static int imx219_configure_lanes(struct imx219 *imx219)
                                  ARRAY_SIZE(imx219_4lane_regs), NULL);
 };
 
-static int imx219_start_streaming(struct imx219 *imx219,
-                                 struct v4l2_subdev_state *state)
+static int imx219_enable_streams(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_state *state, u32 pad,
+                                u64 streams_mask)
 {
+       struct imx219 *imx219 = to_imx219(sd);
        struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd);
        int ret;
 
@@ -773,8 +775,11 @@ err_rpm_put:
        return ret;
 }
 
-static void imx219_stop_streaming(struct imx219 *imx219)
+static int imx219_disable_streams(struct v4l2_subdev *sd,
+                                 struct v4l2_subdev_state *state, u32 pad,
+                                 u64 streams_mask)
 {
+       struct imx219 *imx219 = to_imx219(sd);
        struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd);
        int ret;
 
@@ -788,22 +793,7 @@ static void imx219_stop_streaming(struct imx219 *imx219)
        __v4l2_ctrl_grab(imx219->hflip, false);
 
        pm_runtime_put(&client->dev);
-}
-
-static int imx219_set_stream(struct v4l2_subdev *sd, int enable)
-{
-       struct imx219 *imx219 = to_imx219(sd);
-       struct v4l2_subdev_state *state;
-       int ret = 0;
-
-       state = v4l2_subdev_lock_and_get_active_state(sd);
-
-       if (enable)
-               ret = imx219_start_streaming(imx219, state);
-       else
-               imx219_stop_streaming(imx219);
 
-       v4l2_subdev_unlock_state(state);
        return ret;
 }
 
@@ -995,7 +985,7 @@ static int imx219_init_state(struct v4l2_subdev *sd,
 }
 
 static const struct v4l2_subdev_video_ops imx219_video_ops = {
-       .s_stream = imx219_set_stream,
+       .s_stream = v4l2_subdev_s_stream_helper,
 };
 
 static const struct v4l2_subdev_pad_ops imx219_pad_ops = {
@@ -1004,6 +994,8 @@ static const struct v4l2_subdev_pad_ops imx219_pad_ops = {
        .set_fmt = imx219_set_pad_format,
        .get_selection = imx219_get_selection,
        .enum_frame_size = imx219_enum_frame_size,
+       .enable_streams = imx219_enable_streams,
+       .disable_streams = imx219_disable_streams,
 };
 
 static const struct v4l2_subdev_ops imx219_subdev_ops = {