On Tue, Sep 10, 2024 at 06:06:05PM +0100, Prabhakar wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
>
> Drop mutex while applying controls and just rely on
> pm_runtime_get_if_in_use() call.
Here too the commit message should explain why the mutex can be dropped.
Given that it is only used in .s_ctrl(), and the control framework
serializes calls to the function, the mutex is not needed.
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/i2c/ov5645.c | 12 +-----------
> 1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c
> index 45687d004004..25c60afcc0ec 100644
> --- a/drivers/media/i2c/ov5645.c
> +++ b/drivers/media/i2c/ov5645.c
> @@ -106,8 +106,6 @@ struct ov5645 {
> u8 timing_tc_reg20;
> u8 timing_tc_reg21;
>
> - struct mutex power_lock; /* lock to protect power state */
> -
> struct gpio_desc *enable_gpio;
> struct gpio_desc *rst_gpio;
> };
> @@ -782,11 +780,8 @@ static int ov5645_s_ctrl(struct v4l2_ctrl *ctrl)
> struct ov5645, ctrls);
> int ret;
>
> - mutex_lock(&ov5645->power_lock);
> - if (!pm_runtime_get_if_in_use(ov5645->dev)) {
> - mutex_unlock(&ov5645->power_lock);
> + if (!pm_runtime_get_if_in_use(ov5645->dev))
> return 0;
> - }
>
> switch (ctrl->id) {
> case V4L2_CID_SATURATION:
> @@ -817,7 +812,6 @@ static int ov5645_s_ctrl(struct v4l2_ctrl *ctrl)
>
> pm_runtime_mark_last_busy(ov5645->dev);
> pm_runtime_put_autosuspend(ov5645->dev);
> - mutex_unlock(&ov5645->power_lock);
>
> return ret;
> }
> @@ -1124,8 +1118,6 @@ static int ov5645_probe(struct i2c_client *client)
> if (IS_ERR(ov5645->rst_gpio))
> return dev_err_probe(dev, PTR_ERR(ov5645->rst_gpio), "cannot get reset gpio\n");
>
> - mutex_init(&ov5645->power_lock);
> -
> v4l2_ctrl_handler_init(&ov5645->ctrls, 9);
> v4l2_ctrl_new_std(&ov5645->ctrls, &ov5645_ctrl_ops,
> V4L2_CID_SATURATION, -4, 4, 1, 0);
> @@ -1245,7 +1237,6 @@ static int ov5645_probe(struct i2c_client *client)
> media_entity_cleanup(&ov5645->sd.entity);
> free_ctrl:
> v4l2_ctrl_handler_free(&ov5645->ctrls);
> - mutex_destroy(&ov5645->power_lock);
>
> return ret;
> }
> @@ -1262,7 +1253,6 @@ static void ov5645_remove(struct i2c_client *client)
> if (!pm_runtime_status_suspended(ov5645->dev))
> ov5645_set_power_off(ov5645->dev);
> pm_runtime_set_suspended(ov5645->dev);
> - mutex_destroy(&ov5645->power_lock);
> }
>
> static const struct i2c_device_id ov5645_id[] = {
--
Regards,
Laurent Pinchart
