Skip to content

Commit fd620fc

Browse files
javiercarrascocruzChun-Kuang Hu
authored andcommitted
drm/mediatek: Switch to for_each_child_of_node_scoped()
Introduce the scoped variant of the loop to automatically release the child node when it goes out of scope, which is more robust than the non-scoped variant, and accounts for new early exits that could be added in the future. Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> Reviewed-by: CK Hu <ck.hu@mediatek.com> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://patchwork.kernel.org/project/dri-devel/patch/20241011-mtk_drm_drv_memleak-v1-2-2b40c74c8d75@gmail.com/ Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
1 parent f708e8b commit fd620fc

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/gpu/drm/mediatek/mtk_drm_drv.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,11 @@ static bool mtk_drm_get_all_drm_priv(struct device *dev)
372372
struct mtk_drm_private *temp_drm_priv;
373373
struct device_node *phandle = dev->parent->of_node;
374374
const struct of_device_id *of_id;
375-
struct device_node *node;
376375
struct device *drm_dev;
377376
unsigned int cnt = 0;
378377
int i, j;
379378

380-
for_each_child_of_node(phandle->parent, node) {
379+
for_each_child_of_node_scoped(phandle->parent, node) {
381380
struct platform_device *pdev;
382381

383382
of_id = of_match_node(mtk_drm_of_ids, node);
@@ -406,10 +405,8 @@ static bool mtk_drm_get_all_drm_priv(struct device *dev)
406405
if (temp_drm_priv->mtk_drm_bound)
407406
cnt++;
408407

409-
if (cnt == MAX_CRTC) {
410-
of_node_put(node);
408+
if (cnt == MAX_CRTC)
411409
break;
412-
}
413410
}
414411

415412
if (drm_priv->data->mmsys_dev_num == cnt) {

0 commit comments

Comments
 (0)