Commit bc0500c1 authored by Sakari Ailus's avatar Sakari Ailus Committed by Rafael J. Wysocki
Browse files

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: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Rob Herring <robh@kernel.org> (for OF)
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 87e5e95d

drivers/acpi/property.c

+26 −0
Original line number Diff line number Diff line
@@ -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,			\

drivers/base/property.c

+11 −0
Original line number Diff line number Diff line
@@ -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

drivers/base/swnode.c

+12 −0
Original line number Diff line number Diff line
@@ -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,

drivers/of/property.c

+6 −0
Original line number Diff line number Diff line
@@ -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,

include/linux/fwnode.h

+2 −0
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE