[PATCH 1/4] media: nxp: use devm_mutex_init() simple code
From: Frank Li <Frank.Li@nxp.com>
Date: 2025-11-17 18:58:42
Also in:
imx, linux-media, lkml
Subsystem:
media driver for freescale imx pxp, media drivers for freescale imx7/8, media input infrastructure (v4l/dvb), the rest · Maintainers:
Philipp Zabel, Laurent Pinchart, Frank Li, Martin Kepplinger-Novakovic, Mauro Carvalho Chehab, Linus Torvalds
Use devm_mutex_init() simple code. No functional change. Signed-off-by: Frank Li <Frank.Li@nxp.com> --- drivers/media/platform/nxp/imx-pxp.c | 5 ++++- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 11 +++++------ drivers/media/platform/nxp/mx2_emmaprp.c | 7 +++---- 3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/media/platform/nxp/imx-pxp.c b/drivers/media/platform/nxp/imx-pxp.c
index 3f9a67a6bd4d268841f85f9b69af03138300d188..32d39c8013c7eef1f9629f971cc74afecd463ac7 100644
--- a/drivers/media/platform/nxp/imx-pxp.c
+++ b/drivers/media/platform/nxp/imx-pxp.c@@ -1805,6 +1805,10 @@ static int pxp_probe(struct platform_device *pdev) spin_lock_init(&dev->irqlock); + ret = devm_mutex_init(&pdev->dev, &dev->dev_mutex); + if (ret) + return ret; + ret = devm_request_irq(&pdev->dev, irq, pxp_irq_handler, 0, dev_name(&pdev->dev), dev); if (ret < 0) {
@@ -1831,7 +1835,6 @@ static int pxp_probe(struct platform_device *pdev) goto err_clk; atomic_set(&dev->num_inst, 0); - mutex_init(&dev->dev_mutex); dev->vfd = pxp_videodev; vfd = &dev->vfd;
diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
index 371b4e81328c107269f89da23818ab0abd0179da..0851f4a9ae52d3096f454da643cfdc5017e000b1 100644
--- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
+++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c@@ -1033,15 +1033,17 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, &state->sd); - mutex_init(&state->lock); + ret = devm_mutex_init(dev, &state->lock); + if (ret) + return ret; ret = imx8mq_mipi_csi_subdev_init(state); if (ret < 0) - goto mutex; + return ret; ret = imx8mq_mipi_csi_init_icc(pdev); if (ret) - goto mutex; + return ret; /* Enable runtime PM. */ pm_runtime_enable(dev);
@@ -1068,8 +1070,6 @@ static int imx8mq_mipi_csi_probe(struct platform_device *pdev) v4l2_async_unregister_subdev(&state->sd); icc: imx8mq_mipi_csi_release_icc(pdev); -mutex: - mutex_destroy(&state->lock); return ret; }
@@ -1087,7 +1087,6 @@ static void imx8mq_mipi_csi_remove(struct platform_device *pdev) imx8mq_mipi_csi_runtime_suspend(&pdev->dev); media_entity_cleanup(&state->sd.entity); v4l2_subdev_cleanup(&state->sd); - mutex_destroy(&state->lock); pm_runtime_set_suspended(&pdev->dev); imx8mq_mipi_csi_release_icc(pdev); }
diff --git a/drivers/media/platform/nxp/mx2_emmaprp.c b/drivers/media/platform/nxp/mx2_emmaprp.c
index 02d57229b9b3a600303cc0429e102139385071d6..384a2672884e96d17cca542ef51fbef62328b66a 100644
--- a/drivers/media/platform/nxp/mx2_emmaprp.c
+++ b/drivers/media/platform/nxp/mx2_emmaprp.c@@ -824,7 +824,9 @@ static int emmaprp_probe(struct platform_device *pdev) if (ret) return ret; - mutex_init(&pcdev->dev_mutex); + ret = devm_mutex_init(&pdev->dev, &pcdev->dev_mutex); + if (ret) + return ret; vfd = video_device_alloc(); if (!vfd) {
@@ -878,8 +880,6 @@ static int emmaprp_probe(struct platform_device *pdev) unreg_dev: v4l2_device_unregister(&pcdev->v4l2_dev); - mutex_destroy(&pcdev->dev_mutex); - return ret; }
@@ -892,7 +892,6 @@ static void emmaprp_remove(struct platform_device *pdev) video_unregister_device(pcdev->vfd); v4l2_m2m_release(pcdev->m2m_dev); v4l2_device_unregister(&pcdev->v4l2_dev); - mutex_destroy(&pcdev->dev_mutex); } static struct platform_driver emmaprp_pdrv = {
--
2.34.1