From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: Petr Mladek <pmladek@suse.com>,
linux-kernel@vger.kernel.org, rafael@kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-acpi@vger.kernel.org, devicetree@vger.kernel.org,
Rob Herring <robh@kernel.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>
Subject: [PATCH v4 08/11] lib/vsprintf: Make use of fwnode API to obtain node names and separators
Date: Mon, 2 Sep 2019 11:32:37 +0300 [thread overview]
Message-ID: <20190902083240.20367-9-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20190902083240.20367-1-sakari.ailus@linux.intel.com>
Instead of implementing our own means of discovering parent nodes, node
names or counting how many parents a node has, use the newly added
functions in the fwnode API to obtain that information.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
lib/vsprintf.c | 38 ++++++++++++++++----------------------
1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index b00b57f9f911f..a04a2167101ef 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -38,6 +38,7 @@
#include <net/addrconf.h>
#include <linux/siphash.h>
#include <linux/compiler.h>
+#include <linux/property.h>
#ifdef CONFIG_BLOCK
#include <linux/blkdev.h>
#endif
@@ -1863,32 +1864,24 @@ char *flags_string(char *buf, char *end, void *flags_ptr,
return format_flags(buf, end, flags, names);
}
-static const char *device_node_name_for_depth(const struct device_node *np, int depth)
-{
- for ( ; np && depth; depth--)
- np = np->parent;
-
- return kbasename(np->full_name);
-}
-
static noinline_for_stack
-char *device_node_gen_full_name(const struct device_node *np, char *buf, char *end)
+char *fwnode_full_name_string(struct fwnode_handle *fwnode, char *buf,
+ char *end)
{
int depth;
- const struct device_node *parent = np->parent;
- /* special case for root node */
- if (!parent)
- return string_nocheck(buf, end, "/", default_str_spec);
+ for (depth = fwnode_count_parents(fwnode); depth >= 0; depth--) {
+ struct fwnode_handle *__fwnode =
+ fwnode_get_nth_parent(fwnode, depth);
- for (depth = 0; parent->parent; depth++)
- parent = parent->parent;
-
- for ( ; depth >= 0; depth--) {
- buf = string_nocheck(buf, end, "/", default_str_spec);
- buf = string(buf, end, device_node_name_for_depth(np, depth),
+ buf = string(buf, end, fwnode_get_name_prefix(__fwnode),
+ default_str_spec);
+ buf = string(buf, end, fwnode_get_name(__fwnode),
default_str_spec);
+
+ fwnode_handle_put(__fwnode);
}
+
return buf;
}
@@ -1933,10 +1926,11 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
switch (*fmt) {
case 'f': /* full_name */
- buf = device_node_gen_full_name(dn, buf, end);
+ buf = fwnode_full_name_string(of_fwnode_handle(dn), buf,
+ end);
break;
case 'n': /* name */
- p = kbasename(of_node_full_name(dn));
+ p = fwnode_get_name(of_fwnode_handle(dn));
precision = str_spec.precision;
str_spec.precision = strchrnul(p, '@') - p;
buf = string(buf, end, p, str_spec);
@@ -1946,7 +1940,7 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
buf = number(buf, end, (unsigned int)dn->phandle, num_spec);
break;
case 'P': /* path-spec */
- p = kbasename(of_node_full_name(dn));
+ p = fwnode_get_name(of_fwnode_handle(dn));
if (!p[1])
p = "/";
buf = string(buf, end, p, str_spec);
--
2.20.1
next prev parent reply other threads:[~2019-09-02 8:32 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-02 8:32 [PATCH v4 00/11] Device property improvements, add %pfw format specifier Sakari Ailus
2019-09-02 8:32 ` [PATCH v4 01/11] software node: Get reference to parent swnode in get_parent op Sakari Ailus
2019-09-02 10:10 ` Andy Shevchenko
2019-09-02 8:32 ` [PATCH v4 02/11] software node: Make argument to to_software_node const Sakari Ailus
2019-09-02 8:32 ` [PATCH v4 03/11] device property: Move fwnode_get_parent() up Sakari Ailus
2019-09-02 10:11 ` Andy Shevchenko
2019-09-02 8:32 ` [PATCH v4 04/11] device property: Add functions for accessing node's parents Sakari Ailus
2019-09-02 10:14 ` Andy Shevchenko
2019-09-02 12:34 ` Sakari Ailus
2019-09-02 12:46 ` Andy Shevchenko
2019-09-02 8:32 ` [PATCH v4 05/11] device property: Add fwnode_get_name for returning the name of a node Sakari Ailus
2019-09-02 8:32 ` [PATCH v4 06/11] device property: Add a function to obtain a node's prefix Sakari Ailus
2019-09-02 10:16 ` Andy Shevchenko
2019-09-02 8:32 ` [PATCH v4 07/11] lib/vsprintf: Remove support for %pF and %pf in favour of %pS and %ps Sakari Ailus
2019-09-02 14:39 ` Petr Mladek
2019-09-02 16:01 ` Andy Shevchenko
2019-09-03 14:04 ` Petr Mladek
2019-09-06 6:59 ` Sakari Ailus
2019-09-02 8:32 ` Sakari Ailus [this message]
2019-09-02 15:18 ` [PATCH v4 08/11] lib/vsprintf: Make use of fwnode API to obtain node names and separators Petr Mladek
2019-09-02 15:41 ` Sakari Ailus
2019-09-02 8:32 ` [PATCH v4 09/11] lib/vsprintf: OF nodes are first and foremost, struct device_nodes Sakari Ailus
2019-09-02 10:21 ` Andy Shevchenko
2019-09-02 8:32 ` [PATCH v4 10/11] lib/vsprintf: Add %pfw conversion specifier for printing fwnode names Sakari Ailus
2019-09-03 13:06 ` Petr Mladek
2019-09-04 15:04 ` Sakari Ailus
2019-09-04 15:17 ` Andy Shevchenko
2019-09-04 15:39 ` Joe Perches
2019-09-04 15:54 ` Andy Shevchenko
2019-09-04 15:37 ` Joe Perches
2019-09-04 16:09 ` Sakari Ailus
2019-09-02 8:32 ` [PATCH v4 11/11] lib/test_printf: Add tests for %pfw printk modifier Sakari Ailus
2019-09-02 12:26 ` Andy Shevchenko
2019-09-02 13:09 ` Sakari Ailus
2019-09-03 13:38 ` Petr Mladek
2019-09-04 14:03 ` Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190902083240.20367-9-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).