github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 12:35:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: ccs: Switch to guard and scoped_guard

Browse Source 
Replace the use of mutex_{,un}lock() by guard() and scoped_guard() where
it makes sense (i.e. everywhere).

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
Sakari Ailus 2026-01-16 12:56:56 +02:00 committed by Hans Verkuil
parent a88883d120
commit ea3674c446
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2006,9 +2006,8 @@ static int ccs_pre_streamon(struct v4l2_subdev *subdev, u32 flags)
}
}
mutex_lock(&sensor->mutex);
rval = ccs_pm_get_init(sensor);
mutex_unlock(&sensor->mutex);
scoped_guard(mutex, &sensor->mutex)
rval = ccs_pm_get_init(sensor);
if (rval)
return rval;
@ -3045,7 +3044,7 @@ static int ccs_init_state(struct v4l2_subdev *sd,
v4l2_subdev_state_get_crop(sd_state, pad);
bool is_active = !sd->active_state || sd->active_state == sd_state;
mutex_lock(&sensor->mutex);
guard(mutex)(&sensor->mutex);
ccs_get_native_size(ssd, crop);
@ -3054,11 +3053,8 @@ static int ccs_init_state(struct v4l2_subdev *sd,
fmt->code = sensor->internal_csi_format->code;
fmt->field = V4L2_FIELD_NONE;
if (ssd == sensor->pixel_array) {
mutex_unlock(&sensor->mutex);
if (ssd == sensor->pixel_array)
return 0;
}
fmt = v4l2_subdev_state_get_format(sd_state, CCS_PAD_SRC);
fmt->code = ssd == sensor->src ?
@ -3067,8 +3063,6 @@ static int ccs_init_state(struct v4l2_subdev *sd,
ccs_propagate(sd, sd_state, is_active, V4L2_SEL_TGT_CROP);
mutex_unlock(&sensor->mutex);
return 0;
}
@ -3553,9 +3547,8 @@ static int ccs_probe(struct i2c_client *client)
goto out_cleanup;
}
mutex_lock(&sensor->mutex);
rval = ccs_pll_blanking_update(sensor);
mutex_unlock(&sensor->mutex);
scoped_guard(mutex, &sensor->mutex)
rval = ccs_pll_blanking_update(sensor);
if (rval) {
dev_err(&client->dev, "update mode failed\n");
goto out_cleanup;