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

PATCH New Rob Herring 1 participant 1 message Nov 16, 2018 SPARC + UltraSPARC (sparc/sparc64)

Share & tools

Rob Herring

author

2018-11-16 21:06 UTC #0 lore raw

PATCH v2 6/10 sparc: 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.

This was originally applied for 4.19, but reverted. The problematic changes to prom_{32,64}.c have been dropped.

Cc "David S. Miller" <[email protected]>

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
 arch/sparc/kernel/auxio_64.c | 4 ++--
 arch/sparc/kernel/power.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

arch/sparc/kernel/auxio_64.c +2 -2

index 6145658d915a..e1b10f88ffb4 100644
@@ -115,8 +115,8 @@ static int auxio_probe(struct platform_device *dev)
 		auxio_devtype = AUXIO_TYPE_SBUS;
 		size = 1;
 	} else {
-		printk("auxio: Unknown parent bus type [%s]\n",
-		       dp->parent->name);
+		printk("auxio: Unknown parent bus type [%pOFn]\n",
+		       dp->parent);
 		return -ENODEV;
 	}
 	auxio_register = of_ioremap(&dev->resource[0], 0, size, "auxio");

arch/sparc/kernel/power.c +2 -2

index 92627abce311..d941875dd718 100644
@@ -41,8 +41,8 @@ static int power_probe(struct platform_device *op)
 
 	power_reg = of_ioremap(res, 0, 0x4, "power");
 
-	printk(KERN_INFO "%s: Control reg at %llx\n",
-	       op->dev.of_node->name, res->start);
+	printk(KERN_INFO "%pOFn: Control reg at %llx\n",
+	       op->dev.of_node, res->start);
 
 	if (has_button_interrupt(irq, op->dev.of_node)) {
 		if (request_irq(irq,

Signature · 1 line

2.19.1