| Message ID | 20190322152930.16642-5-sakari.ailus@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | Device property improvements, add %pfw format specifier | expand |
On Fri 2019-03-22 17:29:29, Sakari Ailus wrote: > 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> > --- > lib/vsprintf.c | 37 +++++++++++++++---------------------- > 1 file changed, 15 insertions(+), 22 deletions(-) > > diff --git a/lib/vsprintf.c b/lib/vsprintf.c > index 5f60b8d41277..91f2a3e4892e 100644 > --- a/lib/vsprintf.c > +++ b/lib/vsprintf.c > @@ -37,6 +37,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 > @@ -1720,32 +1721,23 @@ char *flags_string(char *buf, char *end, void *flags_ptr, const char *fmt) > 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_gen_full_name(struct fwnode_handle *fwnode, char *buf, char *end) I first read this as fwnode_get_full_name(), see "get" vs. "gen". I guess that it was because there is used also fwnode_get_name(). Please, rename it to fwnode_full_name_string() or so ;-) Best Regards, Petr
Hi Petr, Thank you for reviewing these patches. On Wed, Mar 27, 2019 at 01:53:56PM +0100, Petr Mladek wrote: > On Fri 2019-03-22 17:29:29, Sakari Ailus wrote: > > 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> > > --- > > lib/vsprintf.c | 37 +++++++++++++++---------------------- > > 1 file changed, 15 insertions(+), 22 deletions(-) > > > > diff --git a/lib/vsprintf.c b/lib/vsprintf.c > > index 5f60b8d41277..91f2a3e4892e 100644 > > --- a/lib/vsprintf.c > > +++ b/lib/vsprintf.c > > @@ -37,6 +37,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 > > @@ -1720,32 +1721,23 @@ char *flags_string(char *buf, char *end, void *flags_ptr, const char *fmt) > > 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_gen_full_name(struct fwnode_handle *fwnode, char *buf, char *end) > > I first read this as fwnode_get_full_name(), see "get" vs. "gen". > I guess that it was because there is used also fwnode_get_name(). > > Please, rename it to fwnode_full_name_string() or so ;-) Works for me.
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 5f60b8d41277..91f2a3e4892e 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -37,6 +37,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 @@ -1720,32 +1721,23 @@ char *flags_string(char *buf, char *end, void *flags_ptr, const char *fmt) 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_gen_full_name(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(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(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; } @@ -1790,10 +1782,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_gen_full_name(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); @@ -1803,7 +1796,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);
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> --- lib/vsprintf.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-)