| Message ID | 20240830073454.3539590-1-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next,v2] drm/rockchip: Use for_each_child_of_node_scoped() | expand |
Hi, Am Freitag, 30. August 2024, 09:34:54 CEST schrieb Jinjie Ruan: > Avoids the need for manual cleanup of_node_put() in early exits > from the loop. > > Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> > Reviewed-by: Heiko Stuebner <heiko@sntech.de> > --- > v2: > - Add Reviewed-by. > - Split out from the PATCH set. This patch also appears in your series "[PATCH -next v2 0/3] drm/rockchip: Simplified with for_each_child_of_node_scoped()" it seems, so I think you could describe why it was split from there now. Also patch subject "drm/rockchip: lvds: ...." Thanks Heiko > --- > drivers/gpu/drm/rockchip/rockchip_lvds.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c > index 9a01aa450741..f5b3f18794dd 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c > +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c > @@ -548,7 +548,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, > struct drm_encoder *encoder; > struct drm_connector *connector; > struct device_node *remote = NULL; > - struct device_node *port, *endpoint; > + struct device_node *port; > int ret = 0, child_count = 0; > const char *name; > u32 endpoint_id = 0; > @@ -560,15 +560,13 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, > "can't found port point, please init lvds panel port!\n"); > return -EINVAL; > } > - for_each_child_of_node(port, endpoint) { > + for_each_child_of_node_scoped(port, endpoint) { > child_count++; > of_property_read_u32(endpoint, "reg", &endpoint_id); > ret = drm_of_find_panel_or_bridge(dev->of_node, 1, endpoint_id, > &lvds->panel, &lvds->bridge); > - if (!ret) { > - of_node_put(endpoint); > + if (!ret) > break; > - } > } > if (!child_count) { > DRM_DEV_ERROR(dev, "lvds port does not have any children\n"); >
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c index 9a01aa450741..f5b3f18794dd 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -548,7 +548,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, struct drm_encoder *encoder; struct drm_connector *connector; struct device_node *remote = NULL; - struct device_node *port, *endpoint; + struct device_node *port; int ret = 0, child_count = 0; const char *name; u32 endpoint_id = 0; @@ -560,15 +560,13 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, "can't found port point, please init lvds panel port!\n"); return -EINVAL; } - for_each_child_of_node(port, endpoint) { + for_each_child_of_node_scoped(port, endpoint) { child_count++; of_property_read_u32(endpoint, "reg", &endpoint_id); ret = drm_of_find_panel_or_bridge(dev->of_node, 1, endpoint_id, &lvds->panel, &lvds->bridge); - if (!ret) { - of_node_put(endpoint); + if (!ret) break; - } } if (!child_count) { DRM_DEV_ERROR(dev, "lvds port does not have any children\n");