Skip to content

Commit b9ef7b4

Browse files
robherringmpe
robherring
authored and
mpe
committed
powerpc: 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: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Arnd Bergmann <arnd@arndb.de> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
1 parent 0bdba86 commit b9ef7b4

File tree

9 files changed

+40
-40
lines changed

9 files changed

+40
-40
lines changed

‎arch/powerpc/platforms/44x/fsp2.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@ static void node_irq_request(const char *compat, irq_handler_t errirq_handler)
210210
for_each_compatible_node(np, NULL, compat) {
211211
irq = irq_of_parse_and_map(np, 0);
212212
if (irq == NO_IRQ) {
213-
pr_err("device tree node %s is missing a interrupt",
214-
np->name);
213+
pr_err("device tree node %pOFn is missing a interrupt",
214+
np);
215215
return;
216216
}
217217

218218
rc = request_irq(irq, errirq_handler, 0, np->name, np);
219219
if (rc) {
220-
pr_err("fsp_of_probe: request_irq failed: np=%s rc=%d",
221-
np->full_name, rc);
220+
pr_err("fsp_of_probe: request_irq failed: np=%pOF rc=%d",
221+
np, rc);
222222
return;
223223
}
224224
}

‎arch/powerpc/platforms/cell/spu_manage.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ static int __init of_enumerate_spus(int (*fn)(void *data))
282282
for_each_node_by_type(node, "spe") {
283283
ret = fn(node);
284284
if (ret) {
285-
printk(KERN_WARNING "%s: Error initializing %s\n",
286-
__func__, node->name);
285+
printk(KERN_WARNING "%s: Error initializing %pOFn\n",
286+
__func__, node);
287287
of_node_put(node);
288288
break;
289289
}

‎arch/powerpc/platforms/embedded6xx/wii.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static void __iomem *wii_ioremap_hw_regs(char *name, char *compatible)
112112
}
113113
error = of_address_to_resource(np, 0, &res);
114114
if (error) {
115-
pr_err("no valid reg found for %s\n", np->name);
115+
pr_err("no valid reg found for %pOFn\n", np);
116116
goto out_put;
117117
}
118118

‎arch/powerpc/platforms/powernv/opal-powercap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ void __init opal_powercap_init(void)
199199
}
200200

201201
j = 0;
202-
pcaps[i].pg.name = node->name;
202+
pcaps[i].pg.name = kasprintf(GFP_KERNEL, "%pOFn", node);
203203
if (has_min) {
204204
powercap_add_attr(min, "powercap-min",
205205
&pcaps[i].pattrs[j]);
@@ -237,6 +237,7 @@ void __init opal_powercap_init(void)
237237
while (--i >= 0) {
238238
kfree(pcaps[i].pattrs);
239239
kfree(pcaps[i].pg.attrs);
240+
kfree(pcaps[i].pg.name);
240241
}
241242
kobject_put(powercap_kobj);
242243
out_pcaps:

‎arch/powerpc/platforms/powernv/opal-sensor-groups.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ void __init opal_sensor_groups_init(void)
214214
}
215215

216216
if (!of_property_read_u32(node, "ibm,chip-id", &chipid))
217-
sprintf(sgs[i].name, "%s%d", node->name, chipid);
217+
sprintf(sgs[i].name, "%pOFn%d", node, chipid);
218218
else
219-
sprintf(sgs[i].name, "%s", node->name);
219+
sprintf(sgs[i].name, "%pOFn", node);
220220

221221
sgs[i].sg.name = sgs[i].name;
222222
if (add_attr_group(ops, len, &sgs[i], sgid)) {

‎arch/powerpc/platforms/powernv/opal-sysparam.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ void __init opal_sys_param_init(void)
194194
count = of_property_count_strings(sysparam, "param-name");
195195
if (count < 0) {
196196
pr_err("SYSPARAM: No string found of property param-name in "
197-
"the node %s\n", sysparam->name);
197+
"the node %pOFn\n", sysparam);
198198
goto out_param_buf;
199199
}
200200

‎arch/powerpc/platforms/pseries/hotplug-cpu.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ static int pseries_add_processor(struct device_node *np)
287287

288288
if (cpumask_empty(tmp)) {
289289
printk(KERN_ERR "Unable to find space in cpu_present_mask for"
290-
" processor %s with %d thread(s)\n", np->name,
290+
" processor %pOFn with %d thread(s)\n", np,
291291
nthreads);
292292
goto out_unlock;
293293
}
@@ -481,8 +481,8 @@ static ssize_t dlpar_cpu_add(u32 drc_index)
481481

482482
if (rc) {
483483
saved_rc = rc;
484-
pr_warn("Failed to attach node %s, rc: %d, drc index: %x\n",
485-
dn->name, rc, drc_index);
484+
pr_warn("Failed to attach node %pOFn, rc: %d, drc index: %x\n",
485+
dn, rc, drc_index);
486486

487487
rc = dlpar_release_drc(drc_index);
488488
if (!rc)
@@ -494,8 +494,8 @@ static ssize_t dlpar_cpu_add(u32 drc_index)
494494
rc = dlpar_online_cpu(dn);
495495
if (rc) {
496496
saved_rc = rc;
497-
pr_warn("Failed to online cpu %s, rc: %d, drc index: %x\n",
498-
dn->name, rc, drc_index);
497+
pr_warn("Failed to online cpu %pOFn, rc: %d, drc index: %x\n",
498+
dn, rc, drc_index);
499499

500500
rc = dlpar_detach_node(dn);
501501
if (!rc)
@@ -504,7 +504,7 @@ static ssize_t dlpar_cpu_add(u32 drc_index)
504504
return saved_rc;
505505
}
506506

507-
pr_debug("Successfully added CPU %s, drc index: %x\n", dn->name,
507+
pr_debug("Successfully added CPU %pOFn, drc index: %x\n", dn,
508508
drc_index);
509509
return rc;
510510
}
@@ -570,19 +570,19 @@ static ssize_t dlpar_cpu_remove(struct device_node *dn, u32 drc_index)
570570
{
571571
int rc;
572572

573-
pr_debug("Attempting to remove CPU %s, drc index: %x\n",
574-
dn->name, drc_index);
573+
pr_debug("Attempting to remove CPU %pOFn, drc index: %x\n",
574+
dn, drc_index);
575575

576576
rc = dlpar_offline_cpu(dn);
577577
if (rc) {
578-
pr_warn("Failed to offline CPU %s, rc: %d\n", dn->name, rc);
578+
pr_warn("Failed to offline CPU %pOFn, rc: %d\n", dn, rc);
579579
return -EINVAL;
580580
}
581581

582582
rc = dlpar_release_drc(drc_index);
583583
if (rc) {
584-
pr_warn("Failed to release drc (%x) for CPU %s, rc: %d\n",
585-
drc_index, dn->name, rc);
584+
pr_warn("Failed to release drc (%x) for CPU %pOFn, rc: %d\n",
585+
drc_index, dn, rc);
586586
dlpar_online_cpu(dn);
587587
return rc;
588588
}
@@ -591,7 +591,7 @@ static ssize_t dlpar_cpu_remove(struct device_node *dn, u32 drc_index)
591591
if (rc) {
592592
int saved_rc = rc;
593593

594-
pr_warn("Failed to detach CPU %s, rc: %d", dn->name, rc);
594+
pr_warn("Failed to detach CPU %pOFn, rc: %d", dn, rc);
595595

596596
rc = dlpar_acquire_drc(drc_index);
597597
if (!rc)
@@ -662,8 +662,8 @@ static int find_dlpar_cpus_to_remove(u32 *cpu_drcs, int cpus_to_remove)
662662
rc = of_property_read_u32(dn, "ibm,my-drc-index",
663663
&cpu_drcs[cpus_found - 1]);
664664
if (rc) {
665-
pr_warn("Error occurred getting drc-index for %s\n",
666-
dn->name);
665+
pr_warn("Error occurred getting drc-index for %pOFn\n",
666+
dn);
667667
of_node_put(dn);
668668
return -1;
669669
}

‎arch/powerpc/platforms/pseries/ibmebus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ static ssize_t name_show(struct device *dev,
404404
struct platform_device *ofdev;
405405

406406
ofdev = to_platform_device(dev);
407-
return sprintf(buf, "%s\n", ofdev->dev.of_node->name);
407+
return sprintf(buf, "%pOFn\n", ofdev->dev.of_node);
408408
}
409409
static DEVICE_ATTR_RO(name);
410410

‎arch/powerpc/platforms/pseries/vio.c

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,6 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
13491349
struct device_node *parent_node;
13501350
const __be32 *prop;
13511351
enum vio_dev_family family;
1352-
const char *of_node_name = of_node->name ? of_node->name : "<unknown>";
13531352

13541353
/*
13551354
* Determine if this node is a under the /vdevice node or under the
@@ -1362,24 +1361,24 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
13621361
else if (!strcmp(parent_node->type, "vdevice"))
13631362
family = VDEVICE;
13641363
else {
1365-
pr_warn("%s: parent(%pOF) of %s not recognized.\n",
1364+
pr_warn("%s: parent(%pOF) of %pOFn not recognized.\n",
13661365
__func__,
13671366
parent_node,
1368-
of_node_name);
1367+
of_node);
13691368
of_node_put(parent_node);
13701369
return NULL;
13711370
}
13721371
of_node_put(parent_node);
13731372
} else {
1374-
pr_warn("%s: could not determine the parent of node %s.\n",
1375-
__func__, of_node_name);
1373+
pr_warn("%s: could not determine the parent of node %pOFn.\n",
1374+
__func__, of_node);
13761375
return NULL;
13771376
}
13781377

13791378
if (family == PFO) {
13801379
if (of_get_property(of_node, "interrupt-controller", NULL)) {
1381-
pr_debug("%s: Skipping the interrupt controller %s.\n",
1382-
__func__, of_node_name);
1380+
pr_debug("%s: Skipping the interrupt controller %pOFn.\n",
1381+
__func__, of_node);
13831382
return NULL;
13841383
}
13851384
}
@@ -1399,15 +1398,15 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
13991398
if (of_node->type != NULL)
14001399
viodev->type = of_node->type;
14011400
else {
1402-
pr_warn("%s: node %s is missing the 'device_type' "
1403-
"property.\n", __func__, of_node_name);
1401+
pr_warn("%s: node %pOFn is missing the 'device_type' "
1402+
"property.\n", __func__, of_node);
14041403
goto out;
14051404
}
14061405

14071406
prop = of_get_property(of_node, "reg", NULL);
14081407
if (prop == NULL) {
1409-
pr_warn("%s: node %s missing 'reg'\n",
1410-
__func__, of_node_name);
1408+
pr_warn("%s: node %pOFn missing 'reg'\n",
1409+
__func__, of_node);
14111410
goto out;
14121411
}
14131412
unit_address = of_read_number(prop, 1);
@@ -1422,8 +1421,8 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
14221421
if (prop != NULL)
14231422
viodev->resource_id = of_read_number(prop, 1);
14241423

1425-
dev_set_name(&viodev->dev, "%s", of_node_name);
1426-
viodev->type = of_node_name;
1424+
dev_set_name(&viodev->dev, "%pOFn", of_node);
1425+
viodev->type = dev_name(&viodev->dev);
14271426
viodev->irq = 0;
14281427
}
14291428

@@ -1694,7 +1693,7 @@ struct vio_dev *vio_find_node(struct device_node *vnode)
16941693
snprintf(kobj_name, sizeof(kobj_name), "%x",
16951694
(uint32_t)of_read_number(prop, 1));
16961695
} else if (!strcmp(dev_type, "ibm,platform-facilities"))
1697-
snprintf(kobj_name, sizeof(kobj_name), "%s", vnode->name);
1696+
snprintf(kobj_name, sizeof(kobj_name), "%pOFn", vnode);
16981697
else
16991698
return NULL;
17001699

0 commit comments

Comments
 (0)