media:cdns-csi2tx: replace of_node_put() with __free
Subsystems (2)
PATCH v2 1/1 media:cdns-csi2tx: replace of_node_put() with __free
Use the new cleanup magic to replace of_node_put() with __free(device_node) marking to auto release when they get out of scope.
Suggested-by Julia Lawall <[email protected]>
Signed-off-by R Sundar <[email protected]>
---
Changes since v1 - Nitpick, If function is successful, then it will always return 0 at the end of function. so changed to return value as zero as it reached end of function.
Link to v1 - https://lore.kernel.org/all/[email protected]/
drivers/media/platform/cadence/cdns-csi2tx.c | 21 ++++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-)
drivers/media/platform/cadence/cdns-csi2tx.c +8 -13
@@ -496,49 +496,44 @@ static int csi2tx_get_resources(struct csi2tx_priv *csi2tx,static int csi2tx_check_lanes (struct csi2tx_priv *csi2tx) {struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type =0 }; -struct device_node *ep;int ret, i; - - ep =of_graph_get_endpoint_by_regs (csi2tx->dev->of_node,0 ,0 ); + struct device_node *ep __free(device_node) = +of_graph_get_endpoint_by_regs (csi2tx->dev->of_node,0 ,0 ); +if (!ep)return -EINVAL ; ret =v4l2_fwnode_endpoint_parse (of_fwnode_handle (ep), &v4l2_ep);if (ret) {dev_err (csi2tx->dev,"Could not parse v4l2 endpoint\n" ); - goto out; +return ret; }if (v4l2_ep.bus_type !=V4L2_MBUS_CSI2_DPHY ) {dev_err (csi2tx->dev,"Unsupported media bus type: 0x%x\n" , v4l2_ep.bus_type); - ret = -EINVAL ; - goto out; +return -EINVAL ; } csi2tx->num_lanes = v4l2_ep.bus.mipi_csi2.num_data_lanes;if (csi2tx->num_lanes > csi2tx->max_lanes) {dev_err (csi2tx->dev,"Current configuration uses more lanes than supported\n" ); - ret = -EINVAL ; - goto out; +return -EINVAL ; }for (i =0 ; i < csi2tx->num_lanes; i++) {if (v4l2_ep.bus.mipi_csi2.data_lanes[i] <1 ) {dev_err (csi2tx->dev,"Invalid lane[%d] number: %u\n" , i, v4l2_ep.bus.mipi_csi2.data_lanes[i]); - ret = -EINVAL ; - goto out; +return -EINVAL ; } }memcpy (csi2tx->lanes, v4l2_ep.bus.mipi_csi2.data_lanes,sizeof (csi2tx->lanes)); -out: -of_node_put (ep); -return ret; +return 0 ; }static const struct csi2tx_vops csi2tx_vops = {
Signature · 1 line
2.34.1