iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: i2c: Use pm_runtime_resume_and_get()

Browse Source 
Simplify error handling by using pm_runtime_resume_and_get() instead of
pm_runtime_get_sync() with a put call in the error path.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Benjamin Mugnier <benjamin.mugnier@foss.st.com> (st-vgxy61)
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 20:20:54 +03:00 committed by Hans Verkuil
parent 20290feaae
commit b92f8f3591
8 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/i2c/ccs/ccs-core.c
View File

@ -1893,9 +1893,9 @@ static int ccs_pm_get_init(struct ccs_sensor *sensor)
* relies at the returned value to detect if the device was already
* active or not.
*/
rval = pm_runtime_get_sync(&client->dev);
if (rval < 0)
goto error;
rval = pm_runtime_resume_and_get(&client->dev);
if (rval)
return rval;
/* Device was already active, so don't set controls */
if (rval == 1)

6
drivers/media/i2c/hi846.c
View File

@ -1613,11 +1613,9 @@ static int hi846_set_stream(struct v4l2_subdev *sd, int enable)
mutex_lock(&hi846->mutex);
if (enable) {
ret = pm_runtime_get_sync(&client->dev);
if (ret < 0) {
pm_runtime_put_noidle(&client->dev);
ret = pm_runtime_resume_and_get(&client->dev);
if (ret)
goto out;
}
ret = hi846_start_streaming(hi846);
}

5
drivers/media/i2c/hi847.c
View File

@ -2623,9 +2623,8 @@ static int hi847_set_stream(struct v4l2_subdev *sd, int enable)
mutex_lock(&hi847->mutex);
if (enable) {
ret = pm_runtime_get_sync(&client->dev);
if (ret < 0) {
pm_runtime_put_noidle(&client->dev);
ret = pm_runtime_resume_and_get(&client->dev);
if (ret) {
mutex_unlock(&hi847->mutex);
return ret;
}

14
drivers/media/i2c/imx208.c
View File

@ -720,9 +720,11 @@ static int imx208_set_stream(struct v4l2_subdev *sd, int enable)
}
if (enable) {
ret = pm_runtime_get_sync(&client->dev);
if (ret < 0)
goto err_rpm_put;
ret = pm_runtime_resume_and_get(&client->dev);
if (ret) {
mutex_unlock(&imx208->imx208_mx);
return ret;
}
/*
* Apply default & customized values
@ -819,11 +821,9 @@ static int imx208_read_otp(struct imx208 *imx208)
if (imx208->otp_read)
goto out_unlock;
ret = pm_runtime_get_sync(&client->dev);
if (ret < 0) {
pm_runtime_put_noidle(&client->dev);
ret = pm_runtime_resume_and_get(&client->dev);
if (ret)
goto out_unlock;
}
ret = imx208_identify_module(imx208);
if (ret)

5
drivers/media/i2c/og01a1b.c
View File

@ -737,9 +737,8 @@ static int og01a1b_set_stream(struct v4l2_subdev *sd, int enable)
mutex_lock(&og01a1b->mutex);
if (enable) {
ret = pm_runtime_get_sync(&client->dev);
if (ret < 0) {
pm_runtime_put_noidle(&client->dev);
ret = pm_runtime_resume_and_get(&client->dev);
if (ret) {
mutex_unlock(&og01a1b->mutex);
return ret;
}

6
drivers/media/i2c/ov5693.c
View File

@ -975,9 +975,9 @@ static int ov5693_s_stream(struct v4l2_subdev *sd, int enable)
int ret;
if (enable) {
ret = pm_runtime_get_sync(ov5693->dev);
if (ret < 0)
goto err_power_down;
ret = pm_runtime_resume_and_get(ov5693->dev);
if (ret)
return ret;
mutex_lock(&ov5693->lock);
ret = __v4l2_ctrl_handler_setup(&ov5693->ctrls.handler);

8
drivers/media/i2c/ov7251.c
View File

@ -1340,9 +1340,11 @@ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable)
mutex_lock(&ov7251->lock);
if (enable) {
ret = pm_runtime_get_sync(ov7251->dev);
if (ret < 0)
goto err_power_down;
ret = pm_runtime_resume_and_get(ov7251->dev);
if (ret) {
mutex_unlock(&ov7251->lock);
return ret;
}
ret = ov7251_pll_configure(ov7251);
if (ret) {

9
drivers/media/i2c/st-vgxy61.c
View File

@ -1170,14 +1170,9 @@ static int vgxy61_stream_enable(struct vgxy61_dev *sensor)
if (ret)
return ret;
ret = pm_runtime_get_sync(&client->dev);
if (ret < 0) {
pm_runtime_put_autosuspend(&client->dev);
ret = pm_runtime_resume_and_get(&client->dev);
if (ret)
return ret;
}
/* pm_runtime_get_sync() can return 1 as a valid return code */
ret = 0;
vgxy61_write_reg(sensor, VGXY61_REG_FORMAT_CTRL,
get_bpp_by_code(sensor->fmt.code), &ret);