ACPI data nodes have a name, so let's return that when
fwnode_name() is called.

Signed-off-by: Heikki Krogerus <[email protected]>
---
 drivers/acpi/property.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 8c7c4583b52d..75854e07ed64 100644
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -1219,6 +1219,11 @@ acpi_graph_get_remote_endpoint(const struct 
fwnode_handle *__fwnode)
        return acpi_graph_get_child_prop_value(fwnode, "endpoint", endpoint_nr);
 }
 
+static const char *acpi_fwnode_name(const struct fwnode_handle *node)
+{
+       return is_acpi_data_node(node) ? to_acpi_data_node(node)->name : NULL;
+}
+
 static bool acpi_fwnode_device_is_available(const struct fwnode_handle *fwnode)
 {
        if (!is_acpi_device_node(fwnode))
@@ -1310,6 +1315,7 @@ acpi_fwnode_device_get_match_data(const struct 
fwnode_handle *fwnode,
 
 #define DECLARE_ACPI_FWNODE_OPS(ops) \
        const struct fwnode_operations ops = {                          \
+               .name = acpi_fwnode_name,                               \
                .device_is_available = acpi_fwnode_device_is_available, \
                .device_get_match_data = acpi_fwnode_device_get_match_data, \
                .property_present = acpi_fwnode_property_present,       \
-- 
2.19.1

Reply via email to