Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efd68e72 authored by Grant Likely's avatar Grant Likely
Browse files

devicetree: add helper inline for retrieving a node's full name 



The pattern (np ? np->full_name : "<none>") is rather common in the
kernel, but can also make for quite long lines.  This patch adds a new
inline function, of_node_full_name() so that the test for a valid node
pointer doesn't need to be open coded at all call sites.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
parent cfaf0251

arch/microblaze/pci/pci-common.c

+2 −4
Original line number Diff line number Diff line
@@ -249,8 +249,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev) 
	} else {

		pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",

			 oirq.size, oirq.specifier[0], oirq.specifier[1],

			 oirq.controller ? oirq.controller->full_name :

			 "<default>");

			 of_node_full_name(oirq.controller));



		virq = irq_create_of_mapping(oirq.controller, oirq.specifier,

					     oirq.size);
@@ -1493,8 +1492,7 @@ static void __devinit pcibios_scan_phb(struct pci_controller *hose) 
	struct pci_bus *bus;

	struct device_node *node = hose->dn;



	pr_debug("PCI: Scanning PHB %s\n",

		 node ? node->full_name : "<NO NAME>");

	pr_debug("PCI: Scanning PHB %s\n", of_node_full_name(node));



	pcibios_setup_phb_resources(hose, &resources);

arch/powerpc/kernel/pci-common.c

+2 −4
Original line number Diff line number Diff line
@@ -248,8 +248,7 @@ static int pci_read_irq_line(struct pci_dev *pci_dev) 
	} else {

		pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",

			 oirq.size, oirq.specifier[0], oirq.specifier[1],

			 oirq.controller ? oirq.controller->full_name :

			 "<default>");

			 of_node_full_name(oirq.controller));



		virq = irq_create_of_mapping(oirq.controller, oirq.specifier,

					     oirq.size);
@@ -1628,8 +1627,7 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose) 
	struct device_node *node = hose->dn;

	int mode;



	pr_debug("PCI: Scanning PHB %s\n",

		 node ? node->full_name : "<NO NAME>");

	pr_debug("PCI: Scanning PHB %s\n", of_node_full_name(node));



	/* Get some IO space for the new PHB */

	pcibios_setup_phb_io_space(hose);

arch/powerpc/kernel/vio.c

+2 −3
Original line number Diff line number Diff line
@@ -1296,8 +1296,7 @@ static void __devinit vio_dev_release(struct device *dev) 
	struct iommu_table *tbl = get_iommu_table_base(dev);



	if (tbl)

		iommu_free_table(tbl, dev->of_node ?

			dev->of_node->full_name : dev_name(dev));

		iommu_free_table(tbl, of_node_full_name(dev->of_node));

	of_node_put(dev->of_node);

	kfree(to_vio_dev(dev));

}
@@ -1509,7 +1508,7 @@ static ssize_t devspec_show(struct device *dev, 
{

	struct device_node *of_node = dev->of_node;



	return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none");

	return sprintf(buf, "%s\n", of_node_full_name(of_node));

}



static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,

arch/powerpc/platforms/cell/iommu.c

+1 −2
Original line number Diff line number Diff line
@@ -552,8 +552,7 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev) 
	iommu = cell_iommu_for_node(dev_to_node(dev));

	if (iommu == NULL || list_empty(&iommu->windows)) {

		printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",

		       dev->of_node ? dev->of_node->full_name : "?",

		       dev_to_node(dev));

		       of_node_full_name(dev->of_node), dev_to_node(dev));

		return NULL;

	}

	window = list_entry(iommu->windows.next, struct iommu_window, list);

arch/powerpc/platforms/pseries/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev) 
	if (!pdn || !PCI_DN(pdn)) {

		printk(KERN_WARNING "pci_dma_dev_setup_pSeriesLP: "

		       "no DMA window found for pci dev=%s dn=%s\n",

				 pci_name(dev), dn? dn->full_name : "<null>");

				 pci_name(dev), of_node_full_name(dn));

		return;

	}

	pr_debug("  parent is %s\n", pdn->full_name);