Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux.git] / drivers / of / platform.c

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 6c59673933e90817dea1023f3e200c486f82fdde..04ad312fd85b9a2af8920fb81092b3ae4ca65a41 100644 (file)
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -91,8 +91,8 @@ static void of_device_make_bus_id(struct device *dev)
                 */
                reg = of_get_property(node, "reg", NULL);
                if (reg && (addr = of_translate_address(node, reg)) != OF_BAD_ADDR) {
-                       dev_set_name(dev, dev_name(dev) ? "%llx.%s:%s" : "%llx.%s",
-                                    (unsigned long long)addr, node->name,
+                       dev_set_name(dev, dev_name(dev) ? "%llx.%pOFn:%s" : "%llx.%pOFn",
+                                    (unsigned long long)addr, node,
                                     dev_name(dev));
                        return;
                }
@@ -142,8 +142,8 @@ struct platform_device *of_device_alloc(struct device_node *np,
                        WARN_ON(rc);
                }
                if (of_irq_to_resource_table(np, res, num_irq) != num_irq)
-                       pr_debug("not all legacy IRQ resources mapped for %s\n",
-                                np->name);
+                       pr_debug("not all legacy IRQ resources mapped for %pOFn\n",
+                                np);
        }
 
        dev->dev.of_node = of_node_get(np);