media: i2c: ov5670: Drop system suspend and resume handlers

Stopping streaming on a camera pipeline at system suspend time, and
restarting it at system resume time, requires coordinated action between
the bridge driver and the camera sensor driver. This is handled by the
bridge driver calling the sensor's .s_stream() handler at system suspend
and resume time. There is thus no need for the sensor to independently
implement system sleep PM operations. Drop them.

The streaming field of the driver's private structure is now unused,
drop it as well.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c
index afd84c8e5ee790ba2fa42e3f6600c0b5f2d2d03e..e80db3ecd4f806787d42c0b19b17da2f0c70f590 100644 (file)
--- a/drivers/media/i2c/ov5670.c
+++ b/drivers/media/i2c/ov5670.c
@@ -1882,8 +1882,6 @@ struct ov5670 {
        /* To serialize asynchronus callbacks */
        struct mutex mutex;
 
-       /* Streaming on/off */
-       bool streaming;
        /* True if the device has been identified */
        bool identified;
 };
@@ -2484,7 +2482,6 @@ static int ov5670_set_stream(struct v4l2_subdev *sd, int enable)
                ret = ov5670_stop_streaming(ov5670);
                pm_runtime_put(&client->dev);
        }
-       ov5670->streaming = enable;
        goto unlock_and_return;
 
 error:
@@ -2539,34 +2536,6 @@ static int __maybe_unused ov5670_runtime_suspend(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused ov5670_suspend(struct device *dev)
-{
-       struct v4l2_subdev *sd = dev_get_drvdata(dev);
-       struct ov5670 *ov5670 = to_ov5670(sd);
-
-       if (ov5670->streaming)
-               ov5670_stop_streaming(ov5670);
-
-       return 0;
-}
-
-static int __maybe_unused ov5670_resume(struct device *dev)
-{
-       struct v4l2_subdev *sd = dev_get_drvdata(dev);
-       struct ov5670 *ov5670 = to_ov5670(sd);
-       int ret;
-
-       if (ov5670->streaming) {
-               ret = ov5670_start_streaming(ov5670);
-               if (ret) {
-                       ov5670_stop_streaming(ov5670);
-                       return ret;
-               }
-       }
-
-       return 0;
-}
-
 static const struct v4l2_subdev_core_ops ov5670_core_ops = {
        .log_status = v4l2_ctrl_subdev_log_status,
        .subscribe_event = v4l2_ctrl_subdev_subscribe_event,
@@ -2769,8 +2738,6 @@ static int ov5670_probe(struct i2c_client *client)
                goto error_handler_free;
        }
 
-       ov5670->streaming = false;
-
        /* Set the device's state to active if it's in D0 state. */
        if (full_power)
                pm_runtime_set_active(&client->dev);
@@ -2825,7 +2792,6 @@ static void ov5670_remove(struct i2c_client *client)
 }
 
 static const struct dev_pm_ops ov5670_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(ov5670_suspend, ov5670_resume)
        SET_RUNTIME_PM_OPS(ov5670_runtime_suspend, ov5670_runtime_resume, NULL)
 };