Commit a270f327 authored by Rob Herring's avatar Rob Herring Committed by Will Deacon

arm64: Convert to using %pOF instead of full_name

Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 6f44a0ba
...@@ -82,8 +82,8 @@ static const char *__init cpu_read_enable_method(int cpu) ...@@ -82,8 +82,8 @@ static const char *__init cpu_read_enable_method(int cpu)
* Don't warn spuriously. * Don't warn spuriously.
*/ */
if (cpu != 0) if (cpu != 0)
pr_err("%s: missing enable-method property\n", pr_err("%pOF: missing enable-method property\n",
dn->full_name); dn);
} }
} else { } else {
enable_method = acpi_get_enable_method(cpu); enable_method = acpi_get_enable_method(cpu);
......
...@@ -469,7 +469,7 @@ static u64 __init of_get_cpu_mpidr(struct device_node *dn) ...@@ -469,7 +469,7 @@ static u64 __init of_get_cpu_mpidr(struct device_node *dn)
*/ */
cell = of_get_property(dn, "reg", NULL); cell = of_get_property(dn, "reg", NULL);
if (!cell) { if (!cell) {
pr_err("%s: missing reg property\n", dn->full_name); pr_err("%pOF: missing reg property\n", dn);
return INVALID_HWID; return INVALID_HWID;
} }
...@@ -478,7 +478,7 @@ static u64 __init of_get_cpu_mpidr(struct device_node *dn) ...@@ -478,7 +478,7 @@ static u64 __init of_get_cpu_mpidr(struct device_node *dn)
* Non affinity bits must be set to 0 in the DT * Non affinity bits must be set to 0 in the DT
*/ */
if (hwid & ~MPIDR_HWID_BITMASK) { if (hwid & ~MPIDR_HWID_BITMASK) {
pr_err("%s: invalid reg property\n", dn->full_name); pr_err("%pOF: invalid reg property\n", dn);
return INVALID_HWID; return INVALID_HWID;
} }
return hwid; return hwid;
...@@ -627,8 +627,8 @@ static void __init of_parse_and_init_cpus(void) ...@@ -627,8 +627,8 @@ static void __init of_parse_and_init_cpus(void)
goto next; goto next;
if (is_mpidr_duplicate(cpu_count, hwid)) { if (is_mpidr_duplicate(cpu_count, hwid)) {
pr_err("%s: duplicate cpu reg properties in the DT\n", pr_err("%pOF: duplicate cpu reg properties in the DT\n",
dn->full_name); dn);
goto next; goto next;
} }
...@@ -640,8 +640,8 @@ static void __init of_parse_and_init_cpus(void) ...@@ -640,8 +640,8 @@ static void __init of_parse_and_init_cpus(void)
*/ */
if (hwid == cpu_logical_map(0)) { if (hwid == cpu_logical_map(0)) {
if (bootcpu_valid) { if (bootcpu_valid) {
pr_err("%s: duplicate boot cpu reg property in DT\n", pr_err("%pOF: duplicate boot cpu reg property in DT\n",
dn->full_name); dn);
goto next; goto next;
} }
......
...@@ -45,7 +45,7 @@ static int __init get_cpu_for_node(struct device_node *node) ...@@ -45,7 +45,7 @@ static int __init get_cpu_for_node(struct device_node *node)
} }
} }
pr_crit("Unable to find CPU node for %s\n", cpu_node->full_name); pr_crit("Unable to find CPU node for %pOF\n", cpu_node);
of_node_put(cpu_node); of_node_put(cpu_node);
return -1; return -1;
...@@ -71,8 +71,8 @@ static int __init parse_core(struct device_node *core, int cluster_id, ...@@ -71,8 +71,8 @@ static int __init parse_core(struct device_node *core, int cluster_id,
cpu_topology[cpu].core_id = core_id; cpu_topology[cpu].core_id = core_id;
cpu_topology[cpu].thread_id = i; cpu_topology[cpu].thread_id = i;
} else { } else {
pr_err("%s: Can't get CPU for thread\n", pr_err("%pOF: Can't get CPU for thread\n",
t->full_name); t);
of_node_put(t); of_node_put(t);
return -EINVAL; return -EINVAL;
} }
...@@ -84,15 +84,15 @@ static int __init parse_core(struct device_node *core, int cluster_id, ...@@ -84,15 +84,15 @@ static int __init parse_core(struct device_node *core, int cluster_id,
cpu = get_cpu_for_node(core); cpu = get_cpu_for_node(core);
if (cpu >= 0) { if (cpu >= 0) {
if (!leaf) { if (!leaf) {
pr_err("%s: Core has both threads and CPU\n", pr_err("%pOF: Core has both threads and CPU\n",
core->full_name); core);
return -EINVAL; return -EINVAL;
} }
cpu_topology[cpu].cluster_id = cluster_id; cpu_topology[cpu].cluster_id = cluster_id;
cpu_topology[cpu].core_id = core_id; cpu_topology[cpu].core_id = core_id;
} else if (leaf) { } else if (leaf) {
pr_err("%s: Can't get CPU for leaf core\n", core->full_name); pr_err("%pOF: Can't get CPU for leaf core\n", core);
return -EINVAL; return -EINVAL;
} }
...@@ -137,8 +137,8 @@ static int __init parse_cluster(struct device_node *cluster, int depth) ...@@ -137,8 +137,8 @@ static int __init parse_cluster(struct device_node *cluster, int depth)
has_cores = true; has_cores = true;
if (depth == 0) { if (depth == 0) {
pr_err("%s: cpu-map children should be clusters\n", pr_err("%pOF: cpu-map children should be clusters\n",
c->full_name); c);
of_node_put(c); of_node_put(c);
return -EINVAL; return -EINVAL;
} }
...@@ -146,8 +146,8 @@ static int __init parse_cluster(struct device_node *cluster, int depth) ...@@ -146,8 +146,8 @@ static int __init parse_cluster(struct device_node *cluster, int depth)
if (leaf) { if (leaf) {
ret = parse_core(c, cluster_id, core_id++); ret = parse_core(c, cluster_id, core_id++);
} else { } else {
pr_err("%s: Non-leaf cluster with core %s\n", pr_err("%pOF: Non-leaf cluster with core %s\n",
cluster->full_name, name); cluster, name);
ret = -EINVAL; ret = -EINVAL;
} }
...@@ -159,7 +159,7 @@ static int __init parse_cluster(struct device_node *cluster, int depth) ...@@ -159,7 +159,7 @@ static int __init parse_cluster(struct device_node *cluster, int depth)
} while (c); } while (c);
if (leaf && !has_cores) if (leaf && !has_cores)
pr_warn("%s: empty cluster\n", cluster->full_name); pr_warn("%pOF: empty cluster\n", cluster);
if (leaf) if (leaf)
cluster_id++; cluster_id++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment