summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/power.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-10-15 18:32:54 -0700
committerDavid S. Miller <davem@davemloft.net>2018-10-15 18:32:54 -0700
commita06ecbfe784ceb22e56ae3cd75fe77138e7cfa0b (patch)
tree29a990e09b492de493125e7a69e51c8a6f7c8ca9 /arch/sparc/kernel/power.c
parentd1f1f98c6d1708a90436e1a3b2aff5e93946731b (diff)
downloadlinux-a06ecbfe784ceb22e56ae3cd75fe77138e7cfa0b.tar.gz
linux-a06ecbfe784ceb22e56ae3cd75fe77138e7cfa0b.tar.bz2
linux-a06ecbfe784ceb22e56ae3cd75fe77138e7cfa0b.zip
Revert "sparc: Convert to using %pOFn instead of device_node.name"
This reverts commit 0b9871a3a8cc7234c285b5d9bf66cc6712cfee7c. Causes crashes with qemu, interacts badly with commit commit 6d0a70a284be ("vsprintf: print OF node name using full_name") etc. Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/power.c')
-rw-r--r--arch/sparc/kernel/power.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/power.c b/arch/sparc/kernel/power.c
index d941875dd718..92627abce311 100644
--- a/arch/sparc/kernel/power.c
+++ b/arch/sparc/kernel/power.c
@@ -41,8 +41,8 @@ static int power_probe(struct platform_device *op)
power_reg = of_ioremap(res, 0, 0x4, "power");
- printk(KERN_INFO "%pOFn: Control reg at %llx\n",
- op->dev.of_node, res->start);
+ printk(KERN_INFO "%s: Control reg at %llx\n",
+ op->dev.of_node->name, res->start);
if (has_button_interrupt(irq, op->dev.of_node)) {
if (request_irq(irq,