diff options
author | Rob Herring <robh@kernel.org> | 2018-08-28 11:44:27 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2018-09-07 13:50:03 -0400 |
commit | 6e77137927639fad66e17c06b50fd319d6b59833 (patch) | |
tree | 35dcf9668c9a4285cea9a0e891ce422c6b1b5ab8 | |
parent | 1b9c30fe01df01c17c5ddd9b4ea02b2ca186d5e7 (diff) |
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: Rob Herring <robh@kernel.org>
[tony@atomide.com: updated against clkctrl and rt_idx changes]
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 327cc70e4f18..56a1fe90d394 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c | |||
@@ -2121,8 +2121,8 @@ static int of_dev_find_hwmod(struct device_node *np, | |||
2121 | if (res) | 2121 | if (res) |
2122 | continue; | 2122 | continue; |
2123 | if (!strcmp(p, oh->name)) { | 2123 | if (!strcmp(p, oh->name)) { |
2124 | pr_debug("omap_hwmod: dt %s[%i] uses hwmod %s\n", | 2124 | pr_debug("omap_hwmod: dt %pOFn[%i] uses hwmod %s\n", |
2125 | np->name, i, oh->name); | 2125 | np, i, oh->name); |
2126 | return i; | 2126 | return i; |
2127 | } | 2127 | } |
2128 | } | 2128 | } |
@@ -2255,8 +2255,8 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh, | |||
2255 | return -ENOENT; | 2255 | return -ENOENT; |
2256 | 2256 | ||
2257 | if (nr_addr != 1 || nr_size != 1) { | 2257 | if (nr_addr != 1 || nr_size != 1) { |
2258 | pr_err("%s: invalid range for %s->%s\n", __func__, | 2258 | pr_err("%s: invalid range for %s->%pOFn\n", __func__, |
2259 | oh->name, np->name); | 2259 | oh->name, np); |
2260 | return -EINVAL; | 2260 | return -EINVAL; |
2261 | } | 2261 | } |
2262 | 2262 | ||
@@ -2264,8 +2264,8 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh, | |||
2264 | base = of_translate_address(np, ranges++); | 2264 | base = of_translate_address(np, ranges++); |
2265 | size = be32_to_cpup(ranges); | 2265 | size = be32_to_cpup(ranges); |
2266 | 2266 | ||
2267 | pr_debug("omap_hwmod: %s %s at 0x%llx size 0x%llx\n", | 2267 | pr_debug("omap_hwmod: %s %pOFn at 0x%llx size 0x%llx\n", |
2268 | oh ? oh->name : "", np->name, base, size); | 2268 | oh->name, np, base, size); |
2269 | 2269 | ||
2270 | if (oh && oh->mpu_rt_idx) { | 2270 | if (oh && oh->mpu_rt_idx) { |
2271 | omap_hwmod_fix_mpu_rt_idx(oh, np, res); | 2271 | omap_hwmod_fix_mpu_rt_idx(oh, np, res); |
@@ -2373,8 +2373,8 @@ static int __init _init(struct omap_hwmod *oh, void *data) | |||
2373 | if (r) | 2373 | if (r) |
2374 | pr_debug("omap_hwmod: %s missing dt data\n", oh->name); | 2374 | pr_debug("omap_hwmod: %s missing dt data\n", oh->name); |
2375 | else if (np && index) | 2375 | else if (np && index) |
2376 | pr_warn("omap_hwmod: %s using broken dt data from %s\n", | 2376 | pr_warn("omap_hwmod: %s using broken dt data from %pOFn\n", |
2377 | oh->name, np->name); | 2377 | oh->name, np); |
2378 | 2378 | ||
2379 | r = _init_mpu_rt_base(oh, NULL, index, np); | 2379 | r = _init_mpu_rt_base(oh, NULL, index, np); |
2380 | if (r < 0) { | 2380 | if (r < 0) { |