media: i2c: hi847: 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/hi847.c b/drivers/media/i2c/hi847.c
index 47aa2cd06e32da9bdde6bb89b9a6459dcb2e4d00..4075c389804c1af2f79428f95b530b4427f43f73 100644 (file)
--- a/drivers/media/i2c/hi847.c
+++ b/drivers/media/i2c/hi847.c
@@ -2184,9 +2184,6 @@ struct hi847 {
 
        /* To serialize asynchronus callbacks */
        struct mutex mutex;
-
-       /* Streaming on/off */
-       bool streaming;
 };
 
 static u64 to_pixel_rate(u32 f_index)
@@ -2618,9 +2615,6 @@ static int hi847_set_stream(struct v4l2_subdev *sd, int enable)
        struct i2c_client *client = v4l2_get_subdevdata(sd);
        int ret = 0;
 
-       if (hi847->streaming == enable)
-               return 0;
-
        mutex_lock(&hi847->mutex);
        if (enable) {
                ret = pm_runtime_resume_and_get(&client->dev);
@@ -2640,52 +2634,11 @@ static int hi847_set_stream(struct v4l2_subdev *sd, int enable)
                pm_runtime_put(&client->dev);
        }
 
-       hi847->streaming = enable;
        mutex_unlock(&hi847->mutex);
 
        return ret;
 }
 
-static int __maybe_unused hi847_suspend(struct device *dev)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct v4l2_subdev *sd = i2c_get_clientdata(client);
-       struct hi847 *hi847 = to_hi847(sd);
-
-       mutex_lock(&hi847->mutex);
-       if (hi847->streaming)
-               hi847_stop_streaming(hi847);
-
-       mutex_unlock(&hi847->mutex);
-
-       return 0;
-}
-
-static int __maybe_unused hi847_resume(struct device *dev)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct v4l2_subdev *sd = i2c_get_clientdata(client);
-       struct hi847 *hi847 = to_hi847(sd);
-       int ret;
-
-       mutex_lock(&hi847->mutex);
-       if (hi847->streaming) {
-               ret = hi847_start_streaming(hi847);
-               if (ret)
-                       goto error;
-       }
-
-       mutex_unlock(&hi847->mutex);
-
-       return 0;
-
-error:
-       hi847_stop_streaming(hi847);
-       hi847->streaming = 0;
-       mutex_unlock(&hi847->mutex);
-       return ret;
-}
-
 static int hi847_set_format(struct v4l2_subdev *sd,
                            struct v4l2_subdev_state *sd_state,
                            struct v4l2_subdev_format *fmt)
@@ -2979,10 +2932,6 @@ probe_error_v4l2_ctrl_handler_free:
        return ret;
 }
 
-static const struct dev_pm_ops hi847_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(hi847_suspend, hi847_resume)
-};
-
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id hi847_acpi_ids[] = {
        {"HYV0847"},
@@ -2995,7 +2944,6 @@ MODULE_DEVICE_TABLE(acpi, hi847_acpi_ids);
 static struct i2c_driver hi847_i2c_driver = {
        .driver = {
                .name = "hi847",
-               .pm = &hi847_pm_ops,
                .acpi_match_table = ACPI_PTR(hi847_acpi_ids),
        },
        .probe = hi847_probe,