Re: [PATCH RESEND v2 2/5] media: staging: media: imx6-mipi-csi2: use devm_mutex_init() to simplify code

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

On Fri, Jan 16, 2026 at 11:17:57AM -0500, Frank Li wrote:
> Use devm_mutex_init() to simplify the code. No functional change.
> 
> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/staging/media/imx/imx6-mipi-csi2.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c
> index 1113ea2a37f03753423164069b95c049968cc0af..4f740170d2bbf586ac0a58b5d25f8f8432e9e6a3 100644
> --- a/drivers/staging/media/imx/imx6-mipi-csi2.c
> +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c
> @@ -777,12 +777,14 @@ static int csi2_probe(struct platform_device *pdev)
>  	if (!csi2->base)
>  		return -ENOMEM;
>  
> -	mutex_init(&csi2->lock);
> +	ret = devm_mutex_init(&pdev->dev, &csi2->lock);
> +	if (ret)
> +		return ret;
>  
>  	ret = clk_prepare_enable(csi2->pllref_clk);
>  	if (ret) {
>  		v4l2_err(&csi2->sd, "failed to enable pllref_clk\n");
> -		goto rmmutex;
> +		return ret;
>  	}
>  
>  	ret = clk_prepare_enable(csi2->dphy_clk);
> @@ -805,8 +807,6 @@ static int csi2_probe(struct platform_device *pdev)
>  	clk_disable_unprepare(csi2->dphy_clk);
>  pllref_off:
>  	clk_disable_unprepare(csi2->pllref_clk);
> -rmmutex:
> -	mutex_destroy(&csi2->lock);
>  	return ret;
>  }
>  
> @@ -820,7 +820,6 @@ static void csi2_remove(struct platform_device *pdev)
>  	v4l2_async_unregister_subdev(sd);
>  	clk_disable_unprepare(csi2->dphy_clk);
>  	clk_disable_unprepare(csi2->pllref_clk);
> -	mutex_destroy(&csi2->lock);
>  	media_entity_cleanup(&sd->entity);
>  }
>  

-- 
Regards,

Laurent Pinchart