Re: [PATCH] media: rcar-csi2: Use common error handling code in rcsi2_parse_dt()

From: Dan Carpenter
Date: Fri Mar 01 2024 - 08:43:08 EST


Sakari Ailus pointed out in another thread that we could use __free()
instead. Something like this:

diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
index 582d5e35db0e..c569df6057b7 100644
--- a/drivers/media/platform/renesas/rcar-csi2.c
+++ b/drivers/media/platform/renesas/rcar-csi2.c
@@ -1372,8 +1372,8 @@ static int rcsi2_parse_v4l2(struct rcar_csi2 *priv,
static int rcsi2_parse_dt(struct rcar_csi2 *priv)
{
struct v4l2_async_connection *asc;
- struct fwnode_handle *fwnode;
- struct fwnode_handle *ep;
+ struct fwnode_handle *fwnode __free(fwnode_handle) = NULL;
+ struct fwnode_handle *ep __free(fwnode_handle);
struct v4l2_fwnode_endpoint v4l2_ep = {
.bus_type = V4L2_MBUS_UNKNOWN,
};
@@ -1388,18 +1388,14 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)
ret = v4l2_fwnode_endpoint_parse(ep, &v4l2_ep);
if (ret) {
dev_err(priv->dev, "Could not parse v4l2 endpoint\n");
- fwnode_handle_put(ep);
return -EINVAL;
}

ret = rcsi2_parse_v4l2(priv, &v4l2_ep);
- if (ret) {
- fwnode_handle_put(ep);
+ if (ret)
return ret;
- }

fwnode = fwnode_graph_get_remote_endpoint(ep);
- fwnode_handle_put(ep);

dev_dbg(priv->dev, "Found '%pOF'\n", to_of_node(fwnode));

@@ -1408,7 +1404,6 @@ static int rcsi2_parse_dt(struct rcar_csi2 *priv)

asc = v4l2_async_nf_add_fwnode(&priv->notifier, fwnode,
struct v4l2_async_connection);
- fwnode_handle_put(fwnode);
if (IS_ERR(asc))
return PTR_ERR(asc);