kevin/linux
1
Fork 0
Code

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

Browse Source 
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>
This commit is contained in:
Laurent Pinchart 2023-09-14 21:17:02 +03:00 committed by Hans Verkuil
parent b268547c5c
commit 046da914bf
1 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/media/i2c/ov5675.c
View File

@ -513,9 +513,6 @@ struct ov5675 {
/* To serialize asynchronus callbacks */
struct mutex mutex;
/* Streaming on/off */
bool streaming;
/* True if the device has been identified */
bool identified;
};
@ -968,7 +965,6 @@ static int ov5675_set_stream(struct v4l2_subdev *sd, int enable)
pm_runtime_put(&client->dev);
}
ov5675->streaming = enable;
mutex_unlock(&ov5675->mutex);
return ret;
@ -1024,42 +1020,6 @@ static int ov5675_power_on(struct device *dev)
return 0;
}
static int __maybe_unused ov5675_suspend(struct device *dev)
{
struct v4l2_subdev *sd = dev_get_drvdata(dev);
struct ov5675 *ov5675 = to_ov5675(sd);
mutex_lock(&ov5675->mutex);
if (ov5675->streaming)
ov5675_stop_streaming(ov5675);
mutex_unlock(&ov5675->mutex);
return 0;
}
static int __maybe_unused ov5675_resume(struct device *dev)
{
struct v4l2_subdev *sd = dev_get_drvdata(dev);
struct ov5675 *ov5675 = to_ov5675(sd);
int ret;
mutex_lock(&ov5675->mutex);
if (ov5675->streaming) {
ret = ov5675_start_streaming(ov5675);
if (ret) {
ov5675->streaming = false;
ov5675_stop_streaming(ov5675);
mutex_unlock(&ov5675->mutex);
return ret;
}
}
mutex_unlock(&ov5675->mutex);
return 0;
}
static int ov5675_set_format(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_format *fmt)
@ -1406,7 +1366,6 @@ probe_power_off:
}
static const struct dev_pm_ops ov5675_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(ov5675_suspend, ov5675_resume)
SET_RUNTIME_PM_OPS(ov5675_power_off, ov5675_power_on, NULL)
};