[PATCH v2 4/5] media: nxp: use cleanup __free(fwnode_handle) simplify code
From: Frank Li <Frank.Li@nxp.com>
Date: 2025-11-19 21:34:54
Also in:
imx, linux-media, lkml
Subsystem:
media drivers for freescale imx7/8, media input infrastructure (v4l/dvb), the rest · Maintainers:
Laurent Pinchart, Frank Li, Martin Kepplinger-Novakovic, Mauro Carvalho Chehab, Linus Torvalds
Use cleanup __free(fwnode_handle) simplify code. No functional change. Signed-off-by: Frank Li <Frank.Li@nxp.com> --- change in v2. - move variable define to top. - remove dev_err_probe() change --- drivers/media/platform/nxp/imx-mipi-csis.c | 21 ++++++--------------- drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 21 ++++++--------------- 2 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c
index ce93d868746f002c22e2f86b1e0aa84ec1a76061..f345aba63936f5ee86ec4c621f3cb434002d7c8d 100644
--- a/drivers/media/platform/nxp/imx-mipi-csis.c
+++ b/drivers/media/platform/nxp/imx-mipi-csis.c@@ -12,6 +12,7 @@ * */ +#include <linux/cleanup.h> #include <linux/clk.h> #include <linux/debugfs.h> #include <linux/delay.h>
@@ -1349,7 +1350,7 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis) .bus_type = V4L2_MBUS_CSI2_DPHY, }; struct v4l2_async_connection *asd; - struct fwnode_handle *ep; + struct fwnode_handle *ep __free(fwnode_handle) = NULL; unsigned int i; int ret;
@@ -1362,14 +1363,13 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis) ret = v4l2_fwnode_endpoint_parse(ep, &vep); if (ret) - goto err_parse; + return ret; for (i = 0; i < vep.bus.mipi_csi2.num_data_lanes; ++i) { if (vep.bus.mipi_csi2.data_lanes[i] != i + 1) { dev_err(csis->dev, "data lanes reordering is not supported"); - ret = -EINVAL; - goto err_parse; + return -EINVAL; } }
@@ -1381,12 +1381,8 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis) asd = v4l2_async_nf_add_fwnode_remote(&csis->notifier, ep, struct v4l2_async_connection); - if (IS_ERR(asd)) { - ret = PTR_ERR(asd); - goto err_parse; - } - - fwnode_handle_put(ep); + if (IS_ERR(asd)) + return PTR_ERR(asd); csis->notifier.ops = &mipi_csis_notify_ops;
@@ -1395,11 +1391,6 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis) return ret; return v4l2_async_register_subdev(&csis->sd); - -err_parse: - fwnode_handle_put(ep); - - return ret; } /* -----------------------------------------------------------------------------
diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
index a007c582b4d91660a97910a6a0d53c9b6fcd73e9..bb9dace0cfac08dc43858b69590f3d73457b3c4c 100644
--- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c
+++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c@@ -6,6 +6,7 @@ */ #include <linux/bitfield.h> +#include <linux/cleanup.h> #include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/delay.h>
@@ -716,8 +717,8 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) struct v4l2_fwnode_endpoint vep = { .bus_type = V4L2_MBUS_CSI2_DPHY, }; + struct fwnode_handle *ep __free(fwnode_handle) = NULL; struct v4l2_async_connection *asd; - struct fwnode_handle *ep; unsigned int i; int ret;
@@ -730,14 +731,13 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) ret = v4l2_fwnode_endpoint_parse(ep, &vep); if (ret) - goto err_parse; + return ret; for (i = 0; i < vep.bus.mipi_csi2.num_data_lanes; ++i) { if (vep.bus.mipi_csi2.data_lanes[i] != i + 1) { dev_err(state->dev, "data lanes reordering is not supported"); - ret = -EINVAL; - goto err_parse; + return -EINVAL; } }
@@ -749,12 +749,8 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) asd = v4l2_async_nf_add_fwnode_remote(&state->notifier, ep, struct v4l2_async_connection); - if (IS_ERR(asd)) { - ret = PTR_ERR(asd); - goto err_parse; - } - - fwnode_handle_put(ep); + if (IS_ERR(asd)) + return PTR_ERR(asd); state->notifier.ops = &imx8mq_mipi_csi_notify_ops;
@@ -763,11 +759,6 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) return ret; return v4l2_async_register_subdev(&state->sd); - -err_parse: - fwnode_handle_put(ep); - - return ret; } /* -----------------------------------------------------------------------------
--
2.34.1