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

Commit 3edc2fac authored by Rob Herring's avatar Rob Herring Committed by Greg Kroah-Hartman
Browse files

of: Convert to using %pOFn instead of device_node.name 



commit a613b26a50136ae90ab13943afe90bcbd34adb44 upstream.

In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Reviewed-by: default avatarFrank Rowand <frank.rowand@sony.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 214dea14

drivers/of/device.c

+3 −2
Original line number Diff line number Diff line
@@ -221,7 +221,8 @@ static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len 
		return -ENODEV;



	/* Name & Type */

	csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name,

	/* %p eats all alphanum characters, so %c must be used here */

	csize = snprintf(str, len, "of:N%pOFn%c%s", dev->of_node, 'T',

			 dev->of_node->type);

	tsize = csize;

	len -= csize;
@@ -300,7 +301,7 @@ void of_device_uevent(struct device *dev, struct kobj_uevent_env *env) 
	if ((!dev) || (!dev->of_node))

		return;



	add_uevent_var(env, "OF_NAME=%s", dev->of_node->name);

	add_uevent_var(env, "OF_NAME=%pOFn", dev->of_node);

	add_uevent_var(env, "OF_FULLNAME=%pOF", dev->of_node);

	if (dev->of_node->type && strcmp("<NULL>", dev->of_node->type) != 0)

		add_uevent_var(env, "OF_TYPE=%s", dev->of_node->type);

drivers/of/of_mdio.c

+6 −6
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, 
		return rc;

	}



	dev_dbg(&mdio->dev, "registered phy %s at address %i\n",

		child->name, addr);

	dev_dbg(&mdio->dev, "registered phy %pOFn at address %i\n",

		child, addr);

	return 0;

}
@@ -127,8 +127,8 @@ static int of_mdiobus_register_device(struct mii_bus *mdio, 
		return rc;

	}



	dev_dbg(&mdio->dev, "registered mdio device %s at address %i\n",

		child->name, addr);

	dev_dbg(&mdio->dev, "registered mdio device %pOFn at address %i\n",

		child, addr);

	return 0;

}
@@ -263,8 +263,8 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) 
				continue;



			/* be noisy to encourage people to set reg property */

			dev_info(&mdio->dev, "scan phy %s at address %i\n",

				 child->name, addr);

			dev_info(&mdio->dev, "scan phy %pOFn at address %i\n",

				 child, addr);



			if (of_mdiobus_child_is_phy(child)) {

				rc = of_mdiobus_register_phy(mdio, child, addr);

drivers/of/of_numa.c

+2 −2
Original line number Diff line number Diff line
@@ -168,8 +168,8 @@ int of_node_to_nid(struct device_node *device) 
		np = of_get_next_parent(np);

	}

	if (np && r)

		pr_warn("Invalid \"numa-node-id\" property in node %s\n",

			np->name);

		pr_warn("Invalid \"numa-node-id\" property in node %pOFn\n",

			np);

	of_node_put(np);



	/*

drivers/of/overlay.c

+2 −2
Original line number Diff line number Diff line
@@ -427,8 +427,8 @@ static int build_changeset_next_level(struct overlay_changeset *ovcs, 
	for_each_child_of_node(overlay_node, child) {

		ret = add_changeset_node(ovcs, target_node, child);

		if (ret) {

			pr_debug("Failed to apply node @%pOF/%s, err=%d\n",

				 target_node, child->name, ret);

			pr_debug("Failed to apply node @%pOF/%pOFn, err=%d\n",

				 target_node, child, ret);

			of_node_put(child);

			return ret;

		}

drivers/of/platform.c

+4 −4
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ static void of_device_make_bus_id(struct device *dev) 
		 */

		reg = of_get_property(node, "reg", NULL);

		if (reg && (addr = of_translate_address(node, reg)) != OF_BAD_ADDR) {

			dev_set_name(dev, dev_name(dev) ? "%llx.%s:%s" : "%llx.%s",

				     (unsigned long long)addr, node->name,

			dev_set_name(dev, dev_name(dev) ? "%llx.%pOFn:%s" : "%llx.%pOFn",

				     (unsigned long long)addr, node,

				     dev_name(dev));

			return;

		}
@@ -142,8 +142,8 @@ struct platform_device *of_device_alloc(struct device_node *np, 
			WARN_ON(rc);

		}

		if (of_irq_to_resource_table(np, res, num_irq) != num_irq)

			pr_debug("not all legacy IRQ resources mapped for %s\n",

				 np->name);

			pr_debug("not all legacy IRQ resources mapped for %pOFn\n",

				 np);

	}



	dev->dev.of_node = of_node_get(np);