Commit 2da4207d authored by Frank Li's avatar Frank Li Committed by Hans Verkuil
Browse files

media: staging: media: imx6-mipi-csi2: use devm_mutex_init() to simplify code 



Use devm_mutex_init() to simplify the code. No functional change.

Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patch.msgid.link/20260116-stage-csi2-cleanup-v2-2-a56e9cb25196@nxp.com


Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent 7ce92f35

drivers/staging/media/imx/imx6-mipi-csi2.c

+4 −5
Original line number Diff line number Diff line
@@ -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);

}