Skip to content

L
linux
Commit a06ecbfe authored by David S. Miller's avatar David S. Miller
Browse files
Options

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

This reverts commit 0b9871a3.

Causes crashes with qemu, interacts badly with commit commit
6d0a70a2 ("vsprintf: print OF node name using full_name")
etc.
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1f1f98c
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 51 deletions
arch/sparc/kernel/auxio_64.c
View file @ a06ecbfe
...@@ -115,8 +115,8 @@ static int auxio_probe(struct platform_device *dev) ...@@ -115,8 +115,8 @@ static int auxio_probe(struct platform_device *dev)
auxio_devtype = AUXIO_TYPE_SBUS; auxio_devtype = AUXIO_TYPE_SBUS;
size = 1; size = 1;
} else { } else {
printk("auxio: Unknown parent bus type [%pOFn]\n", printk("auxio: Unknown parent bus type [%s]\n",
dp->parent); dp->parent->name);
return -ENODEV; return -ENODEV;
} }
auxio_register = of_ioremap(&dev->resource[0], 0, size, "auxio"); auxio_register = of_ioremap(&dev->resource[0], 0, size, "auxio");
......
arch/sparc/kernel/power.c
View file @ a06ecbfe
...@@ -41,8 +41,8 @@ static int power_probe(struct platform_device *op) ...@@ -41,8 +41,8 @@ static int power_probe(struct platform_device *op)
power_reg = of_ioremap(res, 0, 0x4, "power"); power_reg = of_ioremap(res, 0, 0x4, "power");
printk(KERN_INFO "%pOFn: Control reg at %llx\n", printk(KERN_INFO "%s: Control reg at %llx\n",
op->dev.of_node, res->start); op->dev.of_node->name, res->start);
if (has_button_interrupt(irq, op->dev.of_node)) { if (has_button_interrupt(irq, op->dev.of_node)) {
if (request_irq(irq, if (request_irq(irq,
......
arch/sparc/kernel/prom_32.c
View file @ a06ecbfe
...@@ -68,8 +68,8 @@ static void __init sparc32_path_component(struct device_node *dp, char *tmp_buf) ...@@ -68,8 +68,8 @@ static void __init sparc32_path_component(struct device_node *dp, char *tmp_buf)
return; return;
regs = rprop->value; regs = rprop->value;
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
regs->which_io, regs->phys_addr); regs->which_io, regs->phys_addr);
} }
...@@ -84,8 +84,8 @@ static void __init sbus_path_component(struct device_node *dp, char *tmp_buf) ...@@ -84,8 +84,8 @@ static void __init sbus_path_component(struct device_node *dp, char *tmp_buf)
return; return;
regs = prop->value; regs = prop->value;
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
regs->which_io, regs->which_io,
regs->phys_addr); regs->phys_addr);
} }
...@@ -104,13 +104,13 @@ static void __init pci_path_component(struct device_node *dp, char *tmp_buf) ...@@ -104,13 +104,13 @@ static void __init pci_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value; regs = prop->value;
devfn = (regs->phys_hi >> 8) & 0xff; devfn = (regs->phys_hi >> 8) & 0xff;
if (devfn & 0x07) { if (devfn & 0x07) {
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
devfn >> 3, devfn >> 3,
devfn & 0x07); devfn & 0x07);
} else { } else {
sprintf(tmp_buf, "%pOFn@%x", sprintf(tmp_buf, "%s@%x",
dp, dp->name,
devfn >> 3); devfn >> 3);
} }
} }
...@@ -127,8 +127,8 @@ static void __init ebus_path_component(struct device_node *dp, char *tmp_buf) ...@@ -127,8 +127,8 @@ static void __init ebus_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value; regs = prop->value;
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
regs->which_io, regs->phys_addr); regs->which_io, regs->phys_addr);
} }
...@@ -167,8 +167,8 @@ static void __init ambapp_path_component(struct device_node *dp, char *tmp_buf) ...@@ -167,8 +167,8 @@ static void __init ambapp_path_component(struct device_node *dp, char *tmp_buf)
return; return;
device = prop->value; device = prop->value;
sprintf(tmp_buf, "%pOFn:%d:%d@%x,%x", sprintf(tmp_buf, "%s:%d:%d@%x,%x",
dp, *vendor, *device, dp->name, *vendor, *device,
*intr, reg0); *intr, reg0);
} }
...@@ -201,7 +201,7 @@ char * __init build_path_component(struct device_node *dp) ...@@ -201,7 +201,7 @@ char * __init build_path_component(struct device_node *dp)
tmp_buf[0] = '\0'; tmp_buf[0] = '\0';
__build_path_component(dp, tmp_buf); __build_path_component(dp, tmp_buf);
if (tmp_buf[0] == '\0') 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); n = prom_early_alloc(strlen(tmp_buf) + 1);
strcpy(n, tmp_buf); strcpy(n, tmp_buf);
......
arch/sparc/kernel/prom_64.c
View file @ a06ecbfe
...@@ -82,8 +82,8 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf) ...@@ -82,8 +82,8 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf)
regs = rprop->value; regs = rprop->value;
if (!of_node_is_root(dp->parent)) { if (!of_node_is_root(dp->parent)) {
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
(unsigned int) (regs->phys_addr >> 32UL), (unsigned int) (regs->phys_addr >> 32UL),
(unsigned int) (regs->phys_addr & 0xffffffffUL)); (unsigned int) (regs->phys_addr & 0xffffffffUL));
return; return;
...@@ -97,17 +97,17 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf) ...@@ -97,17 +97,17 @@ static void __init sun4v_path_component(struct device_node *dp, char *tmp_buf)
const char *prefix = (type == 0) ? "m" : "i"; const char *prefix = (type == 0) ? "m" : "i";
if (low_bits) if (low_bits)
sprintf(tmp_buf, "%pOFn@%s%x,%x", sprintf(tmp_buf, "%s@%s%x,%x",
dp, prefix, dp->name, prefix,
high_bits, low_bits); high_bits, low_bits);
else else
sprintf(tmp_buf, "%pOFn@%s%x", sprintf(tmp_buf, "%s@%s%x",
dp, dp->name,
prefix, prefix,
high_bits); high_bits);
} else if (type == 12) { } else if (type == 12) {
sprintf(tmp_buf, "%pOFn@%x", sprintf(tmp_buf, "%s@%x",
dp, high_bits); dp->name, high_bits);
} }
} }
...@@ -122,8 +122,8 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf) ...@@ -122,8 +122,8 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value; regs = prop->value;
if (!of_node_is_root(dp->parent)) { if (!of_node_is_root(dp->parent)) {
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
(unsigned int) (regs->phys_addr >> 32UL), (unsigned int) (regs->phys_addr >> 32UL),
(unsigned int) (regs->phys_addr & 0xffffffffUL)); (unsigned int) (regs->phys_addr & 0xffffffffUL));
return; return;
...@@ -138,8 +138,8 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf) ...@@ -138,8 +138,8 @@ static void __init sun4u_path_component(struct device_node *dp, char *tmp_buf)
if (tlb_type >= cheetah) if (tlb_type >= cheetah)
mask = 0x7fffff; mask = 0x7fffff;
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
*(u32 *)prop->value, *(u32 *)prop->value,
(unsigned int) (regs->phys_addr & mask)); (unsigned int) (regs->phys_addr & mask));
} }
...@@ -156,8 +156,8 @@ static void __init sbus_path_component(struct device_node *dp, char *tmp_buf) ...@@ -156,8 +156,8 @@ static void __init sbus_path_component(struct device_node *dp, char *tmp_buf)
return; return;
regs = prop->value; regs = prop->value;
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
regs->which_io, regs->which_io,
regs->phys_addr); regs->phys_addr);
} }
...@@ -176,13 +176,13 @@ static void __init pci_path_component(struct device_node *dp, char *tmp_buf) ...@@ -176,13 +176,13 @@ static void __init pci_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value; regs = prop->value;
devfn = (regs->phys_hi >> 8) & 0xff; devfn = (regs->phys_hi >> 8) & 0xff;
if (devfn & 0x07) { if (devfn & 0x07) {
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
devfn >> 3, devfn >> 3,
devfn & 0x07); devfn & 0x07);
} else { } else {
sprintf(tmp_buf, "%pOFn@%x", sprintf(tmp_buf, "%s@%x",
dp, dp->name,
devfn >> 3); devfn >> 3);
} }
} }
...@@ -203,8 +203,8 @@ static void __init upa_path_component(struct device_node *dp, char *tmp_buf) ...@@ -203,8 +203,8 @@ static void __init upa_path_component(struct device_node *dp, char *tmp_buf)
if (!prop) if (!prop)
return; return;
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
*(u32 *) prop->value, *(u32 *) prop->value,
(unsigned int) (regs->phys_addr & 0xffffffffUL)); (unsigned int) (regs->phys_addr & 0xffffffffUL));
} }
...@@ -221,7 +221,7 @@ static void __init vdev_path_component(struct device_node *dp, char *tmp_buf) ...@@ -221,7 +221,7 @@ static void __init vdev_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value; regs = prop->value;
sprintf(tmp_buf, "%pOFn@%x", dp, *regs); sprintf(tmp_buf, "%s@%x", dp->name, *regs);
} }
/* "name@addrhi,addrlo" */ /* "name@addrhi,addrlo" */
...@@ -236,8 +236,8 @@ static void __init ebus_path_component(struct device_node *dp, char *tmp_buf) ...@@ -236,8 +236,8 @@ static void __init ebus_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value; regs = prop->value;
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, dp->name,
(unsigned int) (regs->phys_addr >> 32UL), (unsigned int) (regs->phys_addr >> 32UL),
(unsigned int) (regs->phys_addr & 0xffffffffUL)); (unsigned int) (regs->phys_addr & 0xffffffffUL));
} }
...@@ -257,8 +257,8 @@ static void __init i2c_path_component(struct device_node *dp, char *tmp_buf) ...@@ -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 /* This actually isn't right... should look at the #address-cells
* property of the i2c bus node etc. etc. * property of the i2c bus node etc. etc.
*/ */
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, regs[0], regs[1]); dp->name, regs[0], regs[1]);
} }
/* "name@reg0[,reg1]" */ /* "name@reg0[,reg1]" */
...@@ -274,11 +274,11 @@ static void __init usb_path_component(struct device_node *dp, char *tmp_buf) ...@@ -274,11 +274,11 @@ static void __init usb_path_component(struct device_node *dp, char *tmp_buf)
regs = prop->value; regs = prop->value;
if (prop->length == sizeof(u32) || regs[1] == 1) { if (prop->length == sizeof(u32) || regs[1] == 1) {
sprintf(tmp_buf, "%pOFn@%x", sprintf(tmp_buf, "%s@%x",
dp, regs[0]); dp->name, regs[0]);
} else { } else {
sprintf(tmp_buf, "%pOFn@%x,%x", sprintf(tmp_buf, "%s@%x,%x",
dp, regs[0], regs[1]); dp->name, regs[0], regs[1]);
} }
} }
...@@ -295,11 +295,11 @@ static void __init ieee1394_path_component(struct device_node *dp, char *tmp_buf ...@@ -295,11 +295,11 @@ static void __init ieee1394_path_component(struct device_node *dp, char *tmp_buf
regs = prop->value; regs = prop->value;
if (regs[2] || regs[3]) { if (regs[2] || regs[3]) {
sprintf(tmp_buf, "%pOFn@%08x%08x,%04x%08x", sprintf(tmp_buf, "%s@%08x%08x,%04x%08x",
dp, regs[0], regs[1], regs[2], regs[3]); dp->name, regs[0], regs[1], regs[2], regs[3]);
} else { } else {
sprintf(tmp_buf, "%pOFn@%08x%08x", sprintf(tmp_buf, "%s@%08x%08x",
dp, regs[0], regs[1]); dp->name, regs[0], regs[1]);
} }
} }
...@@ -361,7 +361,7 @@ char * __init build_path_component(struct device_node *dp) ...@@ -361,7 +361,7 @@ char * __init build_path_component(struct device_node *dp)
tmp_buf[0] = '\0'; tmp_buf[0] = '\0';
__build_path_component(dp, tmp_buf); __build_path_component(dp, tmp_buf);
if (tmp_buf[0] == '\0') 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); n = prom_early_alloc(strlen(tmp_buf) + 1);
strcpy(n, tmp_buf); strcpy(n, tmp_buf);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7