diff options
| author | Frank Li <Frank.Li@nxp.com> | 2026-01-16 19:17:57 +0300 |
|---|---|---|
| committer | Hans Verkuil <hverkuil+cisco@kernel.org> | 2026-01-21 10:25:45 +0300 |
| commit | 2da4207d0a7c7de28edde12fe9e3da574f877351 (patch) | |
| tree | cb32ac75a7c5644cce2686bc949f2f32820c6b66 | |
| parent | 7ce92f358970242fba35e854a17663a44d26ccc9 (diff) | |
| download | linux-2da4207d0a7c7de28edde12fe9e3da574f877351.tar.xz | |
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: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patch.msgid.link/20260116-stage-csi2-cleanup-v2-2-a56e9cb25196@nxp.com
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
| -rw-r--r-- | drivers/staging/media/imx/imx6-mipi-csi2.c | 9 |
1 files 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 1113ea2a37f0..4f740170d2bb 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 @@ clean_notifier: 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); } |