From nobody Mon Feb 9 01:31:16 2026 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DB00149002 for ; Fri, 23 Aug 2024 09:13:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404403; cv=none; b=XmkjEYyzprwu9fZdz/SS6bppfFXLOLHWfqPx1nv3NSn3WJVhPek6XfOoFhtPB5d5pKxt9bGsdg1WsO3Pu19uBmOVUlhnIGG71nAAF5enF+7gZ9h9ERk8Ulirkdtoc3P28+biyOoEg5quxY0KAH/ZGL57pp3/ust5yMZRj1kf56g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404403; c=relaxed/simple; bh=00F+qtLVs64QnDBC9O6mqnCINo2jn2ZRF3WxYn/xSGo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BJE+gXNPCPbPXa006y1Wc+/YgscPx5GD6EBsLH2tT8tfVwpfMCiN267mQFIyb+Jvj6OqDg17ZeIAi734yL3vl8PvxWxG7+6jC4r4O9YY8ICPmofFxhyTB2KffrHYbIumxkdneffPnOeo+1B7k8aibkZNS0BdCgQuzRWrH43Jxk8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4WqvVF1hnczyQPX; Fri, 23 Aug 2024 17:12:37 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id 05D831800D2; Fri, 23 Aug 2024 17:13:19 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 23 Aug 2024 17:13:18 +0800 From: Jinjie Ruan To: , , , , , , , , , , , , , CC: Subject: [PATCH -next 1/5] drm/rockchip: Use for_each_child_of_node_scoped() Date: Fri, 23 Aug 2024 17:20:49 +0800 Message-ID: <20240823092053.3170445-2-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823092053.3170445-1-ruanjinjie@huawei.com> References: <20240823092053.3170445-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemh500013.china.huawei.com (7.202.181.146) Content-Type: text/plain; charset="utf-8" Avoids the need for manual cleanup of_node_put() in early exits from the loop. Signed-off-by: Jinjie Ruan Reviewed-by: Heiko Stuebner --- 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/roc= kchip/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, struc= t device *master, struct drm_encoder *encoder; struct drm_connector *connector; struct device_node *remote =3D NULL; - struct device_node *port, *endpoint; + struct device_node *port; int ret =3D 0, child_count =3D 0; const char *name; u32 endpoint_id =3D 0; @@ -560,15 +560,13 @@ static int rockchip_lvds_bind(struct device *dev, str= uct 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 =3D 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"); --=20 2.34.1 From nobody Mon Feb 9 01:31:16 2026 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28486149E0A for ; Fri, 23 Aug 2024 09:13:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.191 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404403; cv=none; b=h3zbaeSaSfs3fDlkjCJaM25bMbscTlqyYDvWIrgPz+d9UIHaZLPX7RG5y2GSG7k0PvhZRpMed4sOIB5axM5IxLr7h2Q0LJ6AbnEvn6HLrYZG5AtxDNgi9hgl/3S03jmLI1o10iy+FnPcxtERGR+iYQUBUcsEx5xozp5BEZJc8+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404403; c=relaxed/simple; bh=+vgSRXn4RJdY9pq4gJlqkXGhpm7/U99/LmmZwCOc6+k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GNR40fDyLsSndElzGZIiAhYVzoq3vRjPy5WkNJLoelUJe8WcNbOGPhQax5fkwSIjSNzQrgEzHsH5DVgZc9i4Ajd8/AKKt3I4ihD46uMIneMHr9/sG7M2+6rb+ScaVDolC0B0VXR2/cOK3WEtRFNIf1U2R3v4dPVJCXIF3eO/lq4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.191 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4WqvVz08Fbz1j6rK; Fri, 23 Aug 2024 17:13:15 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id 9A1921402C7; Fri, 23 Aug 2024 17:13:19 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 23 Aug 2024 17:13:18 +0800 From: Jinjie Ruan To: , , , , , , , , , , , , , CC: Subject: [PATCH -next 2/5] drm/mediatek: Fix missing of_node_put() for mtk_drm_get_all_drm_priv() Date: Fri, 23 Aug 2024 17:20:50 +0800 Message-ID: <20240823092053.3170445-3-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823092053.3170445-1-ruanjinjie@huawei.com> References: <20240823092053.3170445-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemh500013.china.huawei.com (7.202.181.146) Content-Type: text/plain; charset="utf-8" In mtk_drm_get_all_drm_priv(), break in for_each_child_of_node() should call of_node_put() to avoid child node resource leak, use for_each_child_of_node_scoped() to fix it. And avoid the need for manual cleanup of_node_put() in early exits from the loop for another one. Fixes: d761b9450e31 ("drm/mediatek: Add cnt checking for coverity issue") Signed-off-by: Jinjie Ruan --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/media= tek/mtk_drm_drv.c index 77b50c56c124..41aff0183cbd 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -371,12 +371,11 @@ static bool mtk_drm_get_all_drm_priv(struct device *d= ev) struct mtk_drm_private *temp_drm_priv; struct device_node *phandle =3D dev->parent->of_node; const struct of_device_id *of_id; - struct device_node *node; struct device *drm_dev; unsigned int cnt =3D 0; int i, j; =20 - for_each_child_of_node(phandle->parent, node) { + for_each_child_of_node_scoped(phandle->parent, node) { struct platform_device *pdev; =20 of_id =3D of_match_node(mtk_drm_of_ids, node); @@ -828,7 +827,6 @@ static int mtk_drm_probe(struct platform_device *pdev) struct device_node *phandle =3D dev->parent->of_node; const struct of_device_id *of_id; struct mtk_drm_private *private; - struct device_node *node; struct component_match *match =3D NULL; struct platform_device *ovl_adaptor; int ret; @@ -869,7 +867,7 @@ static int mtk_drm_probe(struct platform_device *pdev) } =20 /* Iterate over sibling DISP function blocks */ - for_each_child_of_node(phandle->parent, node) { + for_each_child_of_node_scoped(phandle->parent, node) { const struct of_device_id *of_id; enum mtk_ddp_comp_type comp_type; int comp_id; @@ -933,10 +931,8 @@ static int mtk_drm_probe(struct platform_device *pdev) } =20 ret =3D mtk_ddp_comp_init(node, &private->ddp_comp[comp_id], comp_id); - if (ret) { - of_node_put(node); + if (ret) goto err_node; - } } =20 if (!private->mutex_node) { --=20 2.34.1 From nobody Mon Feb 9 01:31:16 2026 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C133D14A088 for ; Fri, 23 Aug 2024 09:13:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404404; cv=none; b=SJOBID0PIzuOK2caKGJ1TErcoudM8x32t1Ev6+0VSuCon5TN1jLYbTol0qu1RJu2lYqd95+/+tuGS97x6Uy6cgLe4SsMR106jYBHUBBznEhTWZmjGyrjQo4Y3Modv/NlOCO7x9H8OthqnbQBrr4HX20Pid50/RemPOfP1MIJtG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404404; c=relaxed/simple; bh=eiK6Y6DuuI6OV6AlErhWPjgXZQLljRJUceQPp5OCVjQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ut9nbCicM1Et3kfCw1tnP51B6EAzrYd43PjLducovP/XN69LTY20PztTYD8Q3+lw2ABDbnjSHXXAwavnUyXrQFNkWDXSq6QsQIQPXg34WKEiFUWkc2bjBTE4hzEpozx6jvQgVYVtqt1h3UplhYdlzbCEkelZkzqRev67Fh5sTpE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.214]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4WqvSr5x12z1xvwT; Fri, 23 Aug 2024 17:11:24 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id 36B161A016C; Fri, 23 Aug 2024 17:13:20 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 23 Aug 2024 17:13:19 +0800 From: Jinjie Ruan To: , , , , , , , , , , , , , CC: Subject: [PATCH -next 3/5] drm: of: Use for_each_child_of_node_scoped() Date: Fri, 23 Aug 2024 17:20:51 +0800 Message-ID: <20240823092053.3170445-4-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823092053.3170445-1-ruanjinjie@huawei.com> References: <20240823092053.3170445-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemh500013.china.huawei.com (7.202.181.146) Content-Type: text/plain; charset="utf-8" Avoids the need for manual cleanup of_node_put() in early exits from the loop. Signed-off-by: Jinjie Ruan --- drivers/gpu/drm/drm_of.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index 177b600895d3..41d9288c97a7 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -304,10 +304,9 @@ static int drm_of_lvds_get_port_pixels_type(struct dev= ice_node *port_node) static int drm_of_lvds_get_remote_pixels_type( const struct device_node *port_node) { - struct device_node *endpoint =3D NULL; int pixels_type =3D -EPIPE; =20 - for_each_child_of_node(port_node, endpoint) { + for_each_child_of_node_scoped(port_node, endpoint) { struct device_node *remote_port; int current_pt; =20 @@ -315,10 +314,8 @@ static int drm_of_lvds_get_remote_pixels_type( continue; =20 remote_port =3D of_graph_get_remote_port(endpoint); - if (!remote_port) { - of_node_put(endpoint); + if (!remote_port) return -EPIPE; - } =20 current_pt =3D drm_of_lvds_get_port_pixels_type(remote_port); of_node_put(remote_port); @@ -332,10 +329,8 @@ static int drm_of_lvds_get_remote_pixels_type( * configurations by passing the endpoints explicitly to * drm_of_lvds_get_dual_link_pixel_order(). */ - if (!current_pt || pixels_type !=3D current_pt) { - of_node_put(endpoint); + if (!current_pt || pixels_type !=3D current_pt) return -EINVAL; - } } =20 return pixels_type; --=20 2.34.1 From nobody Mon Feb 9 01:31:16 2026 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E088514B082 for ; Fri, 23 Aug 2024 09:13:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404405; cv=none; b=Zw80a9kEdRf6j9Lwng8Djf3AT53/SUE2lPzhsj/qeV+tE3q5jKrW4KMdWbZ7hMViHuYUeRaI4P0cV4DEmjWEn4NQxf1PJQK7XgZ01oAdeAD1ToKrFUZyVmVoOFdX7g1b2efFIC4xSGLykZwRS4eWVbZI3X9uKn3DntaP4dpiKE8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404405; c=relaxed/simple; bh=8SD4/pr8QBYlpewFcQP7Rqn7BjPSOF+URTCVIpMUIZk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XFIdXcKYEubpRRyFW8NzWBseB6aWrh8w+WPAExZiNEwdXM3W4ZdaxOnRwjrCT8TDf2pi7iMt/e7aOdKSgdFkygbFaamWbgPnkzpDoT6Trs9ET5LE706a8nZXMjNye9GRnwwb8iUBp+YC4JQ/uzdZYts9BJokk/iuAlVfUQqYFyc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4WqvSs3FRlz1xvwW; Fri, 23 Aug 2024 17:11:25 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id CDDF914013B; Fri, 23 Aug 2024 17:13:20 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 23 Aug 2024 17:13:20 +0800 From: Jinjie Ruan To: , , , , , , , , , , , , , CC: Subject: [PATCH -next 4/5] drm/nouveau: Use for_each_child_of_node_scoped() Date: Fri, 23 Aug 2024 17:20:52 +0800 Message-ID: <20240823092053.3170445-5-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823092053.3170445-1-ruanjinjie@huawei.com> References: <20240823092053.3170445-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemh500013.china.huawei.com (7.202.181.146) Content-Type: text/plain; charset="utf-8" Avoids the need for manual cleanup of_node_put() in early exits from the loop. Signed-off-by: Jinjie Ruan --- drivers/gpu/drm/nouveau/nouveau_connector.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/= nouveau/nouveau_connector.c index b06aa473102b..8d5c9c74cbb9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -477,14 +477,14 @@ nouveau_connector_of_detect(struct drm_connector *con= nector) struct nouveau_connector *nv_connector =3D nouveau_connector(connector); struct nouveau_encoder *nv_encoder; struct pci_dev *pdev =3D to_pci_dev(dev->dev); - struct device_node *cn, *dn =3D pci_device_to_OF_node(pdev); + struct device_node *dn =3D pci_device_to_OF_node(pdev); =20 if (!dn || !((nv_encoder =3D find_encoder(connector, DCB_OUTPUT_TMDS)) || (nv_encoder =3D find_encoder(connector, DCB_OUTPUT_ANALOG)))) return NULL; =20 - for_each_child_of_node(dn, cn) { + for_each_child_of_node_scoped(dn, cn) { const char *name =3D of_get_property(cn, "name", NULL); const void *edid =3D of_get_property(cn, "EDID", NULL); int idx =3D name ? name[strlen(name) - 1] - 'A' : 0; @@ -492,7 +492,6 @@ nouveau_connector_of_detect(struct drm_connector *conne= ctor) if (nv_encoder->dcb->i2c_index =3D=3D idx && edid) { nv_connector->edid =3D kmemdup(edid, EDID_LENGTH, GFP_KERNEL); - of_node_put(cn); return nv_encoder; } } --=20 2.34.1 From nobody Mon Feb 9 01:31:16 2026 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF83E14AD3E for ; Fri, 23 Aug 2024 09:13:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.255 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404405; cv=none; b=aCMOCzux+eu3adC3s+fi7FpTjxKnEzFICtcVfbxWnZjzd5LaPGxHBId76innl1vkguqEDpD03Fxoc3prflLfe4a15bhOGTz3qWYhB7JceErMW8A8oPc5wIMH+Gh8s89UYz77yEdlvjIQnfmqvOCplST6b78b5DFUXJex4SWjaQ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404405; c=relaxed/simple; bh=Jv3t2nZiJKu1gTtbsCkqlOQGSwrhTUy406Ne9iQCaq0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=n0wDsbHVa1JDaacikqLectHo5djo/Ihb/wYzy5tk/BLZbKmzJ9UBhUPF7NOAHxbjr4LNsCpUBc80/4RQKPdOuU0xgEdqW4NJ1l/Gem3oXG/sBqfqGsjcjKXxigrLvNP/ePM4y7HXpM0PeAtDuIBtRxf49rm/yKj8zqzCBYD4m98= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.255 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4WqvVH6mtQz13dVH; Fri, 23 Aug 2024 17:12:39 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id 6E37718005F; Fri, 23 Aug 2024 17:13:21 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 23 Aug 2024 17:13:20 +0800 From: Jinjie Ruan To: , , , , , , , , , , , , , CC: Subject: [PATCH -next 5/5] gpu: host1x: Use for_each_available_child_of_node_scoped() Date: Fri, 23 Aug 2024 17:20:53 +0800 Message-ID: <20240823092053.3170445-6-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823092053.3170445-1-ruanjinjie@huawei.com> References: <20240823092053.3170445-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemh500013.china.huawei.com (7.202.181.146) Content-Type: text/plain; charset="utf-8" Avoids the need for manual cleanup of_node_put() in early exits from the loop. Signed-off-by: Jinjie Ruan --- drivers/gpu/host1x/bus.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 8e09d6d328d2..344cc9e741c1 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -41,7 +41,6 @@ static int host1x_subdev_add(struct host1x_device *device, struct device_node *np) { struct host1x_subdev *subdev; - struct device_node *child; int err; =20 subdev =3D kzalloc(sizeof(*subdev), GFP_KERNEL); @@ -56,13 +55,12 @@ static int host1x_subdev_add(struct host1x_device *devi= ce, mutex_unlock(&device->subdevs_lock); =20 /* recursively add children */ - for_each_child_of_node(np, child) { + for_each_child_of_node_scoped(np, child) { if (of_match_node(driver->subdevs, child) && of_device_is_available(child)) { err =3D host1x_subdev_add(device, driver, child); if (err < 0) { /* XXX cleanup? */ - of_node_put(child); return err; } } @@ -90,17 +88,14 @@ static void host1x_subdev_del(struct host1x_subdev *sub= dev) static int host1x_device_parse_dt(struct host1x_device *device, struct host1x_driver *driver) { - struct device_node *np; int err; =20 - for_each_child_of_node(device->dev.parent->of_node, np) { + for_each_child_of_node_scoped(device->dev.parent->of_node, np) { if (of_match_node(driver->subdevs, np) && of_device_is_available(np)) { err =3D host1x_subdev_add(device, driver, np); - if (err < 0) { - of_node_put(np); + if (err < 0) return err; - } } } =20 --=20 2.34.1