Hi Jacopo,
Thanks for the patch.
Could you cc the next version to linux-acpi@xxxxxxxxxxxxxxx, please? Cc
Mika, too.
On Wed, Dec 13, 2017 at 07:26:17PM +0100, Jacopo Mondi wrote:
> Add operation to retrieve the device name from a fwnode handle.
>
> Signed-off-by: Jacopo Mondi <jacopo+renesas@xxxxxxxxxx>
> ---
> drivers/acpi/property.c | 6 ++++++
> drivers/base/property.c | 12 ++++++++++++
> drivers/of/property.c | 6 ++++++
> include/linux/fwnode.h | 2 ++
> include/linux/property.h | 1 +
> 5 files changed, 27 insertions(+)
>
> diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
> index e26ea20..1e3971c 100644
> --- a/drivers/acpi/property.c
> +++ b/drivers/acpi/property.c
> @@ -1186,6 +1186,11 @@ acpi_fwnode_property_read_string_array(const struct fwnode_handle *fwnode,
> val, nval);
> }
>
> +static const char *acpi_fwnode_get_name(const struct fwnode_handle *fwnode)
> +{
> + return acpi_dev_name(to_acpi_device_node(fwnode));
This works for device nodes but will fail miserably for non-device ACPI
nodes.
The ACPI nodes don't currently have a name such as the DT nodes do, it
would certainly help debugging if they did.
What you'll at least need to do is to check to_acpi_device_node() does not
return NULL.
acpi_dev_name() should be made const as well if the function is still used
in v2.
> +}
> +
> static struct fwnode_handle *
> acpi_fwnode_get_named_child_node(const struct fwnode_handle *fwnode,
> const char *childname)
> @@ -1281,6 +1286,7 @@ static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
> acpi_fwnode_property_read_string_array, \
> .get_parent = acpi_node_get_parent, \
> .get_next_child_node = acpi_get_next_subnode, \
> + .get_name = acpi_fwnode_get_name, \
> .get_named_child_node = acpi_fwnode_get_named_child_node, \
> .get_reference_args = acpi_fwnode_get_reference_args, \
> .graph_get_next_endpoint = \
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index 851b1b6..a87b4a9 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -950,6 +950,18 @@ int device_add_properties(struct device *dev,
> EXPORT_SYMBOL_GPL(device_add_properties);
>
> /**
> + * fwnode_get_name - Return the fwnode_handle name
> + * @fwnode: Firmware node to get name from
> + *
> + * Returns a pointer to the firmware node name
> + */
> +const char *fwnode_get_name(const struct fwnode_handle *fwnode)
> +{
> + return fwnode_call_ptr_op(fwnode, get_name);
> +}
> +EXPORT_SYMBOL(fwnode_get_name);
> +
> +/**
> * fwnode_get_next_parent - Iterate to the node's parent
> * @fwnode: Firmware whose parent is retrieved
> *
> diff --git a/drivers/of/property.c b/drivers/of/property.c
> index 8ad33a4..6c195a8 100644
> --- a/drivers/of/property.c
> +++ b/drivers/of/property.c
> @@ -875,6 +875,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 of_node_full_name(to_of_node(fwnode));
> +}
> +
> static struct fwnode_handle *
> of_fwnode_get_parent(const struct fwnode_handle *fwnode)
> {
> @@ -988,6 +993,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 411a84c..5d3a8c6 100644
> --- a/include/linux/fwnode.h
> +++ b/include/linux/fwnode.h
> @@ -57,6 +57,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 fwnode name.
> * @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.
> @@ -81,6 +82,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 f6189a3..0fc464f 100644
> --- a/include/linux/property.h
> +++ b/include/linux/property.h
> @@ -78,6 +78,7 @@ int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode,
> unsigned int nargs, unsigned int index,
> struct fwnode_reference_args *args);
>
> +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);
--
Kind regards,
Sakari Ailus
sakari.ailus@xxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
