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

[linux.git] / arch / sparc / kernel / prom_64.c

diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index baeaeed6499391e368240be85baa2698e81a2600..6220411ce8fce390640e417694e9347585b62dcc 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, "%s@%x,%x",
-                       dp->name,
+               sprintf(tmp_buf, "%pOFn@%x,%x",
+                       dp,
                        (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, "%s@%s%x,%x",
-                               dp->name, prefix,
+                       sprintf(tmp_buf, "%pOFn@%s%x,%x",
+                               dp, prefix,
                                high_bits, low_bits);
                else
-                       sprintf(tmp_buf, "%s@%s%x",
-                               dp->name,
+                       sprintf(tmp_buf, "%pOFn@%s%x",
+                               dp,
                                prefix,
                                high_bits);
        } else if (type == 12) {
-               sprintf(tmp_buf, "%s@%x",
-                       dp->name, high_bits);
+               sprintf(tmp_buf, "%pOFn@%x",
+                       dp, 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, "%s@%x,%x",
-                       dp->name,
+               sprintf(tmp_buf, "%pOFn@%x,%x",
+                       dp,
                        (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, "%s@%x,%x",
-                       dp->name,
+               sprintf(tmp_buf, "%pOFn@%x,%x",
+                       dp,
                        *(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, "%s@%x,%x",
-               dp->name,
+       sprintf(tmp_buf, "%pOFn@%x,%x",
+               dp,
                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, "%s@%x,%x",
-                       dp->name,
+               sprintf(tmp_buf, "%pOFn@%x,%x",
+                       dp,
                        devfn >> 3,
                        devfn & 0x07);
        } else {
-               sprintf(tmp_buf, "%s@%x",
-                       dp->name,
+               sprintf(tmp_buf, "%pOFn@%x",
+                       dp,
                        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, "%s@%x,%x",
-               dp->name,
+       sprintf(tmp_buf, "%pOFn@%x,%x",
+               dp,
                *(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, "%s@%x", dp->name, *regs);
+       sprintf(tmp_buf, "%pOFn@%x", dp, *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, "%s@%x,%x",
-               dp->name,
+       sprintf(tmp_buf, "%pOFn@%x,%x",
+               dp,
                (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, "%s@%x,%x",
-               dp->name, regs[0], regs[1]);
+       sprintf(tmp_buf, "%pOFn@%x,%x",
+               dp, 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, "%s@%x",
-                       dp->name, regs[0]);
+               sprintf(tmp_buf, "%pOFn@%x",
+                       dp, regs[0]);
        } else {
-               sprintf(tmp_buf, "%s@%x,%x",
-                       dp->name, regs[0], regs[1]);
+               sprintf(tmp_buf, "%pOFn@%x,%x",
+                       dp, 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, "%s@%08x%08x,%04x%08x",
-                       dp->name, regs[0], regs[1], regs[2], regs[3]);
+               sprintf(tmp_buf, "%pOFn@%08x%08x,%04x%08x",
+                       dp, regs[0], regs[1], regs[2], regs[3]);
        } else {
-               sprintf(tmp_buf, "%s@%08x%08x",
-                       dp->name, regs[0], regs[1]);
+               sprintf(tmp_buf, "%pOFn@%08x%08x",
+                       dp, 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')
-               strcpy(tmp_buf, dp->name);
+               snprintf(tmp_buf, sizeof(tmp_buf), "%pOFn", dp);
 
        n = prom_early_alloc(strlen(tmp_buf) + 1);
        strcpy(n, tmp_buf);