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>

diff --git a/arch/sparc/kernel/auxio_64.c b/arch/sparc/kernel/auxio_64.c
index cc42225..4e8f56c 100644 (file)
--- a/arch/sparc/kernel/auxio_64.c
+++ b/arch/sparc/kernel/auxio_64.c
@@ -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 [%pOFn]\n",
-                      dp->parent);
+               printk("auxio: Unknown parent bus type [%s]\n",
+                      dp->parent->name);
                return -ENODEV;
        }
        auxio_register = of_ioremap(&dev->resource[0], 0, size, "auxio");

diff --git a/arch/sparc/kernel/power.c b/arch/sparc/kernel/power.c
index d941875..92627ab 100644 (file)
--- 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,

diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index 17c87d2..b51cbb9 100644 (file)
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -68,8 +68,8 @@ static void __init sparc32_path_component(struct device_node *dp, char *tmp_buf)
                return;
 
        regs = rprop->value;
-       sprintf(tmp_buf, "%pOFn@%x,%x",
-               dp,
+       sprintf(tmp_buf, "%s@%x,%x",
+               dp->name,
                regs->which_io, regs->phys_addr);
 }
 
@@ -84,8 +84,8 @@ static void __init sbus_path_component(struct device_node *dp, char *tmp_buf)
                return;
 
        regs = prop->value;
-       sprintf(tmp_buf, "%pOFn@%x,%x",
-               dp,
+       sprintf(tmp_buf, "%s@%x,%x",
+               dp->name,
                regs->which_io,
                regs->phys_addr);
 }
@@ -104,13 +104,13 @@ static void __init pci_path_component(struct device_node *dp, char *tmp_buf)
        regs = prop->value;
        devfn = (regs->phys_hi >> 8) & 0xff;
        if (devfn & 0x07) {
-               sprintf(tmp_buf, "%pOFn@%x,%x",
-                       dp,
+               sprintf(tmp_buf, "%s@%x,%x",
+                       dp->name,
                        devfn >> 3,
                        devfn & 0x07);
        } else {
-               sprintf(tmp_buf, "%pOFn@%x",
-                       dp,
+               sprintf(tmp_buf, "%s@%x",
+                       dp->name,
                        devfn >> 3);
        }
 }
@@ -127,8 +127,8 @@ static void __init ebus_path_component(struct device_node *dp, char *tmp_buf)
 
        regs = prop->value;
 
-       sprintf(tmp_buf, "%pOFn@%x,%x",
-               dp,
+       sprintf(tmp_buf, "%s@%x,%x",
+               dp->name,
                regs->which_io, regs->phys_addr);
 }
 
@@ -167,8 +167,8 @@ static void __init ambapp_path_component(struct device_node *dp, char *tmp_buf)
                return;
        device = prop->value;
 
-       sprintf(tmp_buf, "%pOFn:%d:%d@%x,%x",
-               dp, *vendor, *device,
+       sprintf(tmp_buf, "%s:%d:%d@%x,%x",
+               dp->name, *vendor, *device,
                *intr, reg0);
 }
 
@@ -201,7 +201,7 @@ char * __init build_path_component(struct device_node *dp)
        tmp_buf[0] = '\0';
        __build_path_component(dp, tmp_buf);
        if (tmp_buf[0] == '\0')
-               snprintf(tmp_buf, sizeof(tmp_buf), "%pOFn", dp);
+               strcpy(tmp_buf, dp->name);
 
        n = prom_early_alloc(strlen(tmp_buf) + 1);
        strcpy(n, tmp_buf);

diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index 6220411..baeaeed 100644 (file)
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -82,8 +82,8 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf)
 
        regs = rprop->value;
        if (!of_node_is_root(dp->parent)) {
-               sprintf(tmp_buf, "%pOFn@%x,%x",
-                       dp,
+               sprintf(tmp_buf, "%s@%x,%x",
+                       dp->name,
                        (unsigned int) (regs->phys_addr >> 32UL),
                        (unsigned int) (regs->phys_addr & 0xffffffffUL));
                return;
@@ -97,17 +97,17 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf)
                const char *prefix = (type == 0) ? "m" : "i";
 
                if (low_bits)
-                       sprintf(tmp_buf, "%pOFn@%s%x,%x",
-                               dp, prefix,
+                       sprintf(tmp_buf, "%s@%s%x,%x",
+                               dp->name, prefix,
                                high_bits, low_bits);
                else
-                       sprintf(tmp_buf, "%pOFn@%s%x",
-                               dp,
+                       sprintf(tmp_buf, "%s@%s%x",
+                               dp->name,
                                prefix,
                                high_bits);
        } else if (type == 12) {
-               sprintf(tmp_buf, "%pOFn@%x",
-                       dp, high_bits);
+               sprintf(tmp_buf, "%s@%x",
+                       dp->name, high_bits);
        }
 }
 
@@ -122,8 +122,8 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf)
 
        regs = prop->value;
        if (!of_node_is_root(dp->parent)) {
-               sprintf(tmp_buf, "%pOFn@%x,%x",
-                       dp,
+               sprintf(tmp_buf, "%s@%x,%x",
+                       dp->name,
                        (unsigned int) (regs->phys_addr >> 32UL),
                        (unsigned int) (regs->phys_addr & 0xffffffffUL));
                return;
@@ -138,8 +138,8 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf)
                if (tlb_type >= cheetah)
                        mask = 0x7fffff;
 
-               sprintf(tmp_buf, "%pOFn@%x,%x",
-                       dp,
+               sprintf(tmp_buf, "%s@%x,%x",
+                       dp->name,
                        *(u32 *)prop->value,
                        (unsigned int) (regs->phys_addr & mask));
        }
@@ -156,8 +156,8 @@ static void __init sbus_path_component(struct device_node *dp, char *tmp_buf)
                return;
 
        regs = prop->value;
-       sprintf(tmp_buf, "%pOFn@%x,%x",
-               dp,
+       sprintf(tmp_buf, "%s@%x,%x",
+               dp->name,
                regs->which_io,
                regs->phys_addr);
 }
@@ -176,13 +176,13 @@ static void __init pci_path_component(struct device_node *dp, char *tmp_buf)
        regs = prop->value;
        devfn = (regs->phys_hi >> 8) & 0xff;
        if (devfn & 0x07) {
-               sprintf(tmp_buf, "%pOFn@%x,%x",
-                       dp,
+               sprintf(tmp_buf, "%s@%x,%x",
+                       dp->name,
                        devfn >> 3,
                        devfn & 0x07);
        } else {
-               sprintf(tmp_buf, "%pOFn@%x",
-                       dp,
+               sprintf(tmp_buf, "%s@%x",
+                       dp->name,
                        devfn >> 3);
        }
 }
@@ -203,8 +203,8 @@ static void __init upa_path_component(struct device_node *dp, char *tmp_buf)
        if (!prop)
                return;
 
-       sprintf(tmp_buf, "%pOFn@%x,%x",
-               dp,
+       sprintf(tmp_buf, "%s@%x,%x",
+               dp->name,
                *(u32 *) prop->value,
                (unsigned int) (regs->phys_addr & 0xffffffffUL));
 }
@@ -221,7 +221,7 @@ static void __init vdev_path_component(struct device_node *dp, char *tmp_buf)
 
        regs = prop->value;
 
-       sprintf(tmp_buf, "%pOFn@%x", dp, *regs);
+       sprintf(tmp_buf, "%s@%x", dp->name, *regs);
 }
 
 /* "name@addrhi,addrlo" */
@@ -236,8 +236,8 @@ static void __init ebus_path_component(struct device_node *dp, char *tmp_buf)
 
        regs = prop->value;
 
-       sprintf(tmp_buf, "%pOFn@%x,%x",
-               dp,
+       sprintf(tmp_buf, "%s@%x,%x",
+               dp->name,
                (unsigned int) (regs->phys_addr >> 32UL),
                (unsigned int) (regs->phys_addr & 0xffffffffUL));
 }
@@ -257,8 +257,8 @@ static void __init i2c_path_component(struct device_node *dp, char *tmp_buf)
        /* This actually isn't right... should look at the #address-cells
         * property of the i2c bus node etc. etc.
         */
-       sprintf(tmp_buf, "%pOFn@%x,%x",
-               dp, regs[0], regs[1]);
+       sprintf(tmp_buf, "%s@%x,%x",
+               dp->name, regs[0], regs[1]);
 }
 
 /* "name@reg0[,reg1]" */
@@ -274,11 +274,11 @@ static void __init usb_path_component(struct device_node *dp, char *tmp_buf)
        regs = prop->value;
 
        if (prop->length == sizeof(u32) || regs[1] == 1) {
-               sprintf(tmp_buf, "%pOFn@%x",
-                       dp, regs[0]);
+               sprintf(tmp_buf, "%s@%x",
+                       dp->name, regs[0]);
        } else {
-               sprintf(tmp_buf, "%pOFn@%x,%x",
-                       dp, regs[0], regs[1]);
+               sprintf(tmp_buf, "%s@%x,%x",
+                       dp->name, regs[0], regs[1]);
        }
 }
 
@@ -295,11 +295,11 @@ static void __init ieee1394_path_component(struct device_node *dp, char *tmp_buf
        regs = prop->value;
 
        if (regs[2] || regs[3]) {
-               sprintf(tmp_buf, "%pOFn@%08x%08x,%04x%08x",
-                       dp, regs[0], regs[1], regs[2], regs[3]);
+               sprintf(tmp_buf, "%s@%08x%08x,%04x%08x",
+                       dp->name, regs[0], regs[1], regs[2], regs[3]);
        } else {
-               sprintf(tmp_buf, "%pOFn@%08x%08x",
-                       dp, regs[0], regs[1]);
+               sprintf(tmp_buf, "%s@%08x%08x",
+                       dp->name, regs[0], regs[1]);
        }
 }
 
@@ -361,7 +361,7 @@ char * __init build_path_component(struct device_node *dp)
        tmp_buf[0] = '\0';
        __build_path_component(dp, tmp_buf);
        if (tmp_buf[0] == '\0')
-               snprintf(tmp_buf, sizeof(tmp_buf), "%pOFn", dp);
+               strcpy(tmp_buf, dp->name);
 
        n = prom_early_alloc(strlen(tmp_buf) + 1);
        strcpy(n, tmp_buf);