device property: Add fwnode_get_name for returning the name of a node

The fwnode framework did not have means to obtain the name of a node. Add
that now, in form of the fwnode_get_name() function and a corresponding
get_name fwnode op. OF and ACPI support is included.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Rob Herring <robh@kernel.org> (for OF)
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 3eacf474e1e39b07197c5f6975412f4116d22879..a501c1c584b5ce8b28bb97437bed557aba2d20ad 100644 (file)
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -1317,6 +1317,31 @@ 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 struct fwnode_handle *
 acpi_fwnode_get_parent(struct fwnode_handle *fwnode)
 {
@@ -1357,6 +1382,7 @@ 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_reference_args = acpi_fwnode_get_reference_args,   \
                .graph_get_next_endpoint =                              \
                        acpi_graph_get_next_endpoint,                   \

diff --git a/drivers/base/property.c b/drivers/base/property.c
index f2e555e68b56a4fd609f0001345c155fd95db692..9b5ec88e72d8bf8c1b1ff22a083e395a859742fe 100644 (file)
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -556,6 +556,17 @@ int device_add_properties(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(device_add_properties);
 
+/**
+ * fwnode_get_name - Return the name of a node
+ * @fwnode: The firmware node
+ *
+ * Returns a pointer to the node name.
+ */
+const char *fwnode_get_name(const struct fwnode_handle *fwnode)
+{
+       return fwnode_call_ptr_op(fwnode, get_name);
+}
+
 /**
  * fwnode_get_parent - Return parent firwmare node
  * @fwnode: Firmware whose parent is retrieved

diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index 9cde143201f5f44f6aaa2a5998d152db0cdc396e..eacca6a6626b7ae1375180b1cfa5035ebef839c6 100644 (file)
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -515,6 +515,17 @@ static int software_node_read_string_array(const struct fwnode_handle *fwnode,
                                                propname, val, nval);
 }
 
+static const char *
+software_node_get_name(const struct fwnode_handle *fwnode)
+{
+       const struct swnode *swnode = to_swnode(fwnode);
+
+       if (!swnode)
+               return "(null)";
+
+       return kobject_name(&swnode->kobj);
+}
+
 static struct fwnode_handle *
 software_node_get_parent(const struct fwnode_handle *fwnode)
 {
@@ -615,6 +626,7 @@ static const struct fwnode_operations software_node_ops = {
        .property_present = software_node_property_present,
        .property_read_int_array = software_node_read_int_array,
        .property_read_string_array = software_node_read_string_array,
+       .get_name = software_node_get_name,
        .get_parent = software_node_get_parent,
        .get_next_child_node = software_node_get_next_child,
        .get_named_child_node = software_node_get_named_child_node,

diff --git a/drivers/of/property.c b/drivers/of/property.c
index d7fa75e31f22415c447f05fa99437e1591cb0a1a..5bed634551ea65c37df11f796c71295ea1d5b0c6 100644 (file)
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -872,6 +872,11 @@ of_fwnode_property_read_string_array(const struct fwnode_handle *fwnode,
                of_property_count_strings(node, propname);
 }
 
+static const char *of_fwnode_get_name(const struct fwnode_handle *fwnode)
+{
+       return kbasename(to_of_node(fwnode)->full_name);
+}
+
 static struct fwnode_handle *
 of_fwnode_get_parent(const struct fwnode_handle *fwnode)
 {
@@ -993,6 +998,7 @@ const struct fwnode_operations of_fwnode_ops = {
        .property_present = of_fwnode_property_present,
        .property_read_int_array = of_fwnode_property_read_int_array,
        .property_read_string_array = of_fwnode_property_read_string_array,
+       .get_name = of_fwnode_get_name,
        .get_parent = of_fwnode_get_parent,
        .get_next_child_node = of_fwnode_get_next_child_node,
        .get_named_child_node = of_fwnode_get_named_child_node,

diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h
index ababd6bc82f33cc75e5733c92ca6005f30a9bc16..2bbf55739a57365d78a0ecfd82585506442c3aca 100644 (file)
--- a/include/linux/fwnode.h
+++ b/include/linux/fwnode.h
@@ -56,6 +56,7 @@ struct fwnode_reference_args {
  *                              otherwise.
  * @property_read_string_array: Read an array of string properties. Return zero
  *                             on success, a negative error code otherwise.
+ * @get_name: Return the name of an fwnode.
  * @get_parent: Return the parent of an fwnode.
  * @get_next_child_node: Return the next child node in an iteration.
  * @get_named_child_node: Return a child node with a given name.
@@ -82,6 +83,7 @@ struct fwnode_operations {
        (*property_read_string_array)(const struct fwnode_handle *fwnode_handle,
                                      const char *propname, const char **val,
                                      size_t nval);
+       const char *(*get_name)(const struct fwnode_handle *fwnode);
        struct fwnode_handle *(*get_parent)(const struct fwnode_handle *fwnode);
        struct fwnode_handle *
        (*get_next_child_node)(const struct fwnode_handle *fwnode,

diff --git a/include/linux/property.h b/include/linux/property.h
index ea27c5811e1b32bd6a3fa5d453e4106e4add43bd..afa84c47bf169a3aee8738420ff1936f6515b9af 100644 (file)
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -80,6 +80,7 @@ struct fwnode_handle *fwnode_find_reference(const struct fwnode_handle *fwnode,
                                            const char *name,
                                            unsigned int index);
 
+const char *fwnode_get_name(const struct fwnode_handle *fwnode);
 struct fwnode_handle *fwnode_get_parent(const struct fwnode_handle *fwnode);
 struct fwnode_handle *fwnode_get_next_parent(
        struct fwnode_handle *fwnode);