mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-10-22 23:13:01 +02:00
drm/nouveau: Use for_each_child_of_node_scoped()
Avoids the need for manual cleanup of_node_put() in early exits from the loop. Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> Signed-off-by: Danilo Krummrich <dakr@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/20240830073654.3539640-1-ruanjinjie@huawei.com
This commit is contained in:
parent
7a5115ba1d
commit
c7d84a45f4
|
@ -477,14 +477,14 @@ nouveau_connector_of_detect(struct drm_connector *connector)
|
|||
struct nouveau_connector *nv_connector = nouveau_connector(connector);
|
||||
struct nouveau_encoder *nv_encoder;
|
||||
struct pci_dev *pdev = to_pci_dev(dev->dev);
|
||||
struct device_node *cn, *dn = pci_device_to_OF_node(pdev);
|
||||
struct device_node *dn = pci_device_to_OF_node(pdev);
|
||||
|
||||
if (!dn ||
|
||||
!((nv_encoder = find_encoder(connector, DCB_OUTPUT_TMDS)) ||
|
||||
(nv_encoder = find_encoder(connector, DCB_OUTPUT_ANALOG))))
|
||||
return NULL;
|
||||
|
||||
for_each_child_of_node(dn, cn) {
|
||||
for_each_child_of_node_scoped(dn, cn) {
|
||||
const char *name = of_get_property(cn, "name", NULL);
|
||||
const void *edid = of_get_property(cn, "EDID", NULL);
|
||||
int idx = name ? name[strlen(name) - 1] - 'A' : 0;
|
||||
|
@ -492,7 +492,6 @@ nouveau_connector_of_detect(struct drm_connector *connector)
|
|||
if (nv_encoder->dcb->i2c_index == idx && edid) {
|
||||
nv_connector->edid =
|
||||
kmemdup(edid, EDID_LENGTH, GFP_KERNEL);
|
||||
of_node_put(cn);
|
||||
return nv_encoder;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user