Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d0a70a2 authored by Rob Herring's avatar Rob Herring
Browse files

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: default avatarFrank Rowand <frank.rowand@sony.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent a613b26a

lib/vsprintf.c

+6 −1
Original line number Diff line number Diff line
@@ -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);