Commit b63773a8 authored by Rob Herring's avatar Rob Herring Committed by Bjorn Helgaas
Browse files

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarTyrel 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>
parent 36b85189

drivers/pci/host/pci-mvebu.c

+4 −4
Original line number Diff line number Diff line
@@ -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 {

drivers/pci/host/pci-tegra.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/pci/hotplug/pnv_php.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

drivers/pci/hotplug/rpadlpar_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/pci/hotplug/rpaphp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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];