PCI: Convert to using %pOF instead of full_name()

Now that we have a custom printf format specifier, convert users of
full_name() to use %pOF instead.  This is preparation for removing storing
of the full path string for each node.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index f353a6eb2f010aa622c7bf440a6e1312f9748734..424982997eb9a7151e8801e870108783755563ac 100644 (file)
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -1054,8 +1054,8 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie,
        port->pcie = pcie;
 
        if (of_property_read_u32(child, "marvell,pcie-port", &port->port)) {
-               dev_warn(dev, "ignoring %s, missing pcie-port property\n",
-                        of_node_full_name(child));
+               dev_warn(dev, "ignoring %pOF, missing pcie-port property\n",
+                        child);
                goto skip;
        }
 
@@ -1106,8 +1106,8 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie,
                }
 
                if (flags & OF_GPIO_ACTIVE_LOW) {
-                       dev_info(dev, "%s: reset gpio is active low\n",
-                                of_node_full_name(child));
+                       dev_info(dev, "%pOF: reset gpio is active low\n",
+                                child);
                        gpio_flags = GPIOF_ACTIVE_LOW |
                                     GPIOF_OUT_INIT_LOW;
                } else {

diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index b3722b7709df88a228fe736110be37b5ddbbe892..7eb9be5ae3577723660e974e214dda672caf2742 100644 (file)
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -1703,8 +1703,7 @@ static int tegra_pcie_get_legacy_regulators(struct tegra_pcie *pcie)
                pcie->num_supplies = 2;
 
        if (pcie->num_supplies == 0) {
-               dev_err(dev, "device %s not supported in legacy mode\n",
-                       np->full_name);
+               dev_err(dev, "device %pOF not supported in legacy mode\n", np);
                return -ENODEV;
        }
 

diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index 7c203198b582fcdbb3586149d3aa9a698d45e49d..74f6a17e46146f9dd1dffe86de3d002e26f0e1c3 100644 (file)
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -163,8 +163,8 @@ static void pnv_php_detach_device_nodes(struct device_node *parent)
                of_node_put(dn);
                refcount = kref_read(&dn->kobj.kref);
                if (refcount != 1)
-                       pr_warn("Invalid refcount %d on <%s>\n",
-                               refcount, of_node_full_name(dn));
+                       pr_warn("Invalid refcount %d on <%pOF>\n",
+                               refcount, dn);
 
                of_detach_node(dn);
        }

diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 3f93a4e795959f33f5cb5e0d2da044b00d29ccbf..a3449d717a992e2f149475d38a393a2fea6578bd 100644 (file)
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -150,8 +150,8 @@ static void dlpar_pci_add_bus(struct device_node *dn)
        /* Add EADS device to PHB bus, adding new entry to bus->devices */
        dev = of_create_pci_dev(dn, phb->bus, pdn->devfn);
        if (!dev) {
-               printk(KERN_ERR "%s: failed to create pci dev for %s\n",
-                               __func__, dn->full_name);
+               printk(KERN_ERR "%s: failed to create pci dev for %pOF\n",
+                               __func__, dn);
                return;
        }
 

diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 8d132024f06ed579a4ea8b3aefef856b337ed80e..1e29abaaea083e3649f70605c602a9b2070291d1 100644 (file)
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -318,7 +318,7 @@ int rpaphp_add_slot(struct device_node *dn)
        if (!is_php_dn(dn, &indexes, &names, &types, &power_domains))
                return 0;
 
-       dbg("Entry %s: dn->full_name=%s\n", __func__, dn->full_name);
+       dbg("Entry %s: dn=%pOF\n", __func__, dn);
 
        /* register PCI devices */
        name = (char *) &names[1];

diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index ea41ea1d3c0052790b5f18aacae1dd9e33016c0d..32aabc533be86cb8b08941516a1bb65a1895a323 100644 (file)
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -95,7 +95,7 @@ int rpaphp_enable_slot(struct slot *slot)
 
        bus = pci_find_bus_by_node(slot->dn);
        if (!bus) {
-               err("%s: no pci_bus for dn %s\n", __func__, slot->dn->full_name);
+               err("%s: no pci_bus for dn %pOF\n", __func__, slot->dn);
                return -EINVAL;
        }
 
@@ -125,7 +125,7 @@ int rpaphp_enable_slot(struct slot *slot)
 
                if (rpaphp_debug) {
                        struct pci_dev *dev;
-                       dbg("%s: pci_devs of slot[%s]\n", __func__, slot->dn->full_name);
+                       dbg("%s: pci_devs of slot[%pOF]\n", __func__, slot->dn);
                        list_for_each_entry(dev, &bus->devices, bus_list)
                                dbg("\t%s\n", pci_name(dev));
                }

diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 388c4d8fcdd155b6706e4dff907d50c1e32bcb9c..489862360f2ce06e259824c7a8eadb116344edc7 100644 (file)
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -122,8 +122,8 @@ int rpaphp_register_slot(struct slot *slot)
        int retval;
        int slotno = -1;
 
-       dbg("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n",
-               __func__, slot->dn->full_name, slot->index, slot->name,
+       dbg("%s registering slot:path[%pOF] index[%x], name[%s] pdomain[%x] type[%d]\n",
+               __func__, slot->dn, slot->index, slot->name,
                slot->power_domain, slot->type);
 
        /* should not try to register the same slot twice */

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 93e7b97765d767121185844551f2fc004c8aa226..c9cdc8a1d48ab67cc4f7db6c51a117fe40a625c7 100644 (file)
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -556,9 +556,9 @@ static ssize_t devspec_show(struct device *dev,
        struct pci_dev *pdev = to_pci_dev(dev);
        struct device_node *np = pci_device_to_OF_node(pdev);
 
-       if (np == NULL || np->full_name == NULL)
+       if (np == NULL)
                return 0;
-       return sprintf(buf, "%s", np->full_name);
+       return sprintf(buf, "%pOF", np);
 }
 static DEVICE_ATTR_RO(devspec);
 #endif

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index af0cc3456dc1b48b1325c06c5edd2ca8cc22a640..e8e40dea28423b3bc9cf3f6fca34e0fc309f5c47 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -5363,8 +5363,8 @@ static int of_pci_bus_find_domain_nr(struct device *parent)
                use_dt_domains = 0;
                domain = pci_get_new_domain_nr();
        } else {
-               dev_err(parent, "Node %s has inconsistent \"linux,pci-domain\" property in DT\n",
-                       parent->of_node->full_name);
+               dev_err(parent, "Node %pOF has inconsistent \"linux,pci-domain\" property in DT\n",
+                       parent->of_node);
                domain = -1;
        }