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

Commit 6e771379 authored by Rob Herring's avatar Rob Herring Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Convert to using %pOFn instead of device_node.name 



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

Cc: "Benoît Cousson" <bcousson@baylibre.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
[tony@atomide.com: updated against clkctrl and rt_idx changes]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1b9c30fe

arch/arm/mach-omap2/omap_hwmod.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -2121,8 +2121,8 @@ static int of_dev_find_hwmod(struct device_node *np, 
		if (res)

		if (res)

			continue;

			continue;

		if (!strcmp(p, oh->name)) {

		if (!strcmp(p, oh->name)) {

			pr_debug("omap_hwmod: dt %s[%i] uses hwmod %s\n",

			pr_debug("omap_hwmod: dt %pOFn[%i] uses hwmod %s\n",

				 np->name, i, oh->name);

				 np, i, oh->name);

			return i;

			return i;

		}

		}

	}

	}
@@ -2255,8 +2255,8 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh, 
		return -ENOENT;

		return -ENOENT;





	if (nr_addr != 1 || nr_size != 1) {

	if (nr_addr != 1 || nr_size != 1) {

		pr_err("%s: invalid range for %s->%s\n", __func__,

		pr_err("%s: invalid range for %s->%pOFn\n", __func__,

		       oh->name, np->name);

		       oh->name, np);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -2264,8 +2264,8 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh, 
	base = of_translate_address(np, ranges++);

	base = of_translate_address(np, ranges++);

	size = be32_to_cpup(ranges);

	size = be32_to_cpup(ranges);





	pr_debug("omap_hwmod: %s %s at 0x%llx size 0x%llx\n",

	pr_debug("omap_hwmod: %s %pOFn at 0x%llx size 0x%llx\n",

		 oh ? oh->name : "", np->name, base, size);

		 oh->name, np, base, size);





	if (oh && oh->mpu_rt_idx) {

	if (oh && oh->mpu_rt_idx) {

		omap_hwmod_fix_mpu_rt_idx(oh, np, res);

		omap_hwmod_fix_mpu_rt_idx(oh, np, res);
@@ -2373,8 +2373,8 @@ static int __init _init(struct omap_hwmod *oh, void *data) 
	if (r)

	if (r)

		pr_debug("omap_hwmod: %s missing dt data\n", oh->name);

		pr_debug("omap_hwmod: %s missing dt data\n", oh->name);

	else if (np && index)

	else if (np && index)

		pr_warn("omap_hwmod: %s using broken dt data from %s\n",

		pr_warn("omap_hwmod: %s using broken dt data from %pOFn\n",

			oh->name, np->name);

			oh->name, np);





	r = _init_mpu_rt_base(oh, NULL, index, np);

	r = _init_mpu_rt_base(oh, NULL, index, np);

	if (r < 0) {

	if (r < 0) {