On Tuesday, June 9, 2020 3:22:39 PM CEST Heikki Krogerus wrote: > There is no need to re-evaluate the object name. > > Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> > --- > drivers/acpi/property.c | 14 ++------------ > 1 file changed, 2 insertions(+), 12 deletions(-) > > diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c > index e601c4511a8b5..6941062272e0b 100644 > --- a/drivers/acpi/property.c > +++ b/drivers/acpi/property.c > @@ -606,13 +606,7 @@ static struct fwnode_handle * > acpi_fwnode_get_named_child_node(const struct fwnode_handle *fwnode, > const char *childname) > { > - char name[ACPI_PATH_SEGMENT_LENGTH]; > struct fwnode_handle *child; > - struct acpi_buffer path; > - acpi_status status; > - > - path.length = sizeof(name); > - path.pointer = name; > > fwnode_for_each_child_node(fwnode, child) { > if (is_acpi_data_node(child)) { > @@ -621,12 +615,8 @@ acpi_fwnode_get_named_child_node(const struct fwnode_handle *fwnode, > continue; > } > > - status = acpi_get_name(ACPI_HANDLE_FWNODE(child), > - ACPI_SINGLE_NAME, &path); > - if (ACPI_FAILURE(status)) > - break; > - > - if (!strncmp(name, childname, ACPI_NAMESEG_SIZE)) > + if (!strncmp(acpi_device_bid(to_acpi_device_node(child)), > + childname, ACPI_NAMESEG_SIZE)) > return child; > } > > Applied as 5.9 material, thanks!