Merge tag 'microblaze-v5.5-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[linux.git] / drivers / acpi / property.c

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 3eacf474e1e39b07197c5f6975412f4116d22879..e601c4511a8b5202803502976e54ce4b17ed5d18 100644 (file)
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -1317,6 +1317,52 @@ acpi_fwnode_get_reference_args(const struct fwnode_handle *fwnode,
                                                  args_count, args);
 }
 
+static const char *acpi_fwnode_get_name(const struct fwnode_handle *fwnode)
+{
+       const struct acpi_device *adev;
+       struct fwnode_handle *parent;
+
+       /* Is this the root node? */
+       parent = fwnode_get_parent(fwnode);
+       if (!parent)
+               return "\\";
+
+       fwnode_handle_put(parent);
+
+       if (is_acpi_data_node(fwnode)) {
+               const struct acpi_data_node *dn = to_acpi_data_node(fwnode);
+
+               return dn->name;
+       }
+
+       adev = to_acpi_device_node(fwnode);
+       if (WARN_ON(!adev))
+               return NULL;
+
+       return acpi_device_bid(adev);
+}
+
+static const char *
+acpi_fwnode_get_name_prefix(const struct fwnode_handle *fwnode)
+{
+       struct fwnode_handle *parent;
+
+       /* Is this the root node? */
+       parent = fwnode_get_parent(fwnode);
+       if (!parent)
+               return "";
+
+       /* Is this 2nd node from the root? */
+       parent = fwnode_get_next_parent(parent);
+       if (!parent)
+               return "";
+
+       fwnode_handle_put(parent);
+
+       /* ACPI device or data node. */
+       return ".";
+}
+
 static struct fwnode_handle *
 acpi_fwnode_get_parent(struct fwnode_handle *fwnode)
 {
@@ -1357,6 +1403,8 @@ acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode,
                .get_parent = acpi_node_get_parent,                     \
                .get_next_child_node = acpi_get_next_subnode,           \
                .get_named_child_node = acpi_fwnode_get_named_child_node, \
+               .get_name = acpi_fwnode_get_name,                       \
+               .get_name_prefix = acpi_fwnode_get_name_prefix,         \
                .get_reference_args = acpi_fwnode_get_reference_args,   \
                .graph_get_next_endpoint =                              \
                        acpi_graph_get_next_endpoint,                   \