vsprintf: print OF node name using full_name

In preparation to remove the node name pointer from struct device_node,
convert the node name print to get the node name from the full name.

Reviewed-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index d5b3a3f..b1909ca 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1596,6 +1596,7 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
                fmt = "f";
 
        for (pass = false; strspn(fmt,"fnpPFcC"); fmt++, pass = true) {
+               int precision;
                if (pass) {
                        if (buf < end)
                                *buf = ':';
@@ -1607,7 +1608,11 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
                        buf = device_node_gen_full_name(dn, buf, end);
                        break;
                case 'n':       /* name */
-                       buf = string(buf, end, dn->name, str_spec);
+                       p = kbasename(of_node_full_name(dn));
+                       precision = str_spec.precision;
+                       str_spec.precision = strchrnul(p, '@') - p;
+                       buf = string(buf, end, p, str_spec);
+                       str_spec.precision = precision;
                        break;
                case 'p':       /* phandle */
                        buf = number(buf, end, (unsigned int)dn->phandle, num_spec);