15 files changed, 34 insertions, 30 deletions

diff --git a/Documentation/devicetree/bindings/gpio/led.txt b/Documentation/devicetree/bindings/gpio/led.txt
index fd2bd56e719..9bb308abd22 100644
--- a/Documentation/devicetree/bindings/gpio/led.txt
+++ b/Documentation/devicetree/bindings/gpio/led.txt
@@ -55,4 +55,4 @@ run-control {
                 gpios = <&mpc8572 7 0>;
                 default-state = "on";
         };
-}
+};
diff --git a/Documentation/devicetree/bindings/mtd/partition.txt b/Documentation/devicetree/bindings/mtd/partition.txt
index f114ce1657c..6e1f61f1e78 100644
--- a/Documentation/devicetree/bindings/mtd/partition.txt
+++ b/Documentation/devicetree/bindings/mtd/partition.txt
@@ -35,4 +35,4 @@ flash@0 {
         uimage@100000 {
                 reg = <0x0100000 0x200000>;
         };
-];
+};
diff --git a/Documentation/devicetree/usage-model.txt b/Documentation/devicetree/usage-model.txt
index c5a80099b71..dca90fe22a9 100644
--- a/Documentation/devicetree/usage-model.txt
+++ b/Documentation/devicetree/usage-model.txt
@@ -312,7 +312,7 @@ device tree for the NVIDIA Tegra board.
         };
 };
 
-At .machine_init() time, Tegra board support code will need to look at
+At .init_machine() time, Tegra board support code will need to look at
 this DT and decide which nodes to create platform_devices for.
 However, looking at the tree, it is not immediately obvious what kind
 of device each node represents, or even if a node represents a device
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index ed22bfc5db1..ca8f6e76996 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -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);
 
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 0f75bd50040..edef9afd885 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -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);
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 7a421e8fe7c..3052a931f2b 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1294,8 +1294,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));
 }
@@ -1519,7 +1518,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,
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index c264969c931..dca21366674 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -551,8 +551,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);
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 07c09cbbfb1..bca220f2873 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -1134,7 +1134,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);
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 7a3be6f6737..7bbdc26d951 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -580,7 +580,7 @@ static unsigned int __init build_one_device_irq(struct platform_device *op,
                                 printk("%s: Apply [%s:%x] imap --> [%s:%x]\n",
                                        op->dev.of_node->full_name,
                                        pp->full_name, this_orig_irq,
-                                       (iret ? iret->full_name : "NULL"), irq);
+                                       of_node_full_name(iret), irq);
 
                         if (!iret)
                                 break;
diff --git a/drivers/of/base.c b/drivers/of/base.c
index a14f109dcd1..c181b94abc3 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -173,9 +173,9 @@ struct property *of_find_property(const struct device_node *np,
                 return NULL;
 
         read_lock(&devtree_lock);
-        for (pp = np->properties; pp != 0; pp = pp->next) {
+        for (pp = np->properties; pp; pp = pp->next) {
                 if (of_prop_cmp(pp->name, name) == 0) {
-                        if (lenp != 0)
+                        if (lenp)
                                 *lenp = pp->length;
                         break;
                 }
@@ -497,7 +497,7 @@ struct device_node *of_find_node_with_property(struct device_node *from,
         read_lock(&devtree_lock);
         np = from ? from->allnext : allnodes;
         for (; np; np = np->allnext) {
-                for (pp = np->properties; pp != 0; pp = pp->next) {
+                for (pp = np->properties; pp; pp = pp->next) {
                         if (of_prop_cmp(pp->name, prop_name) == 0) {
                                 of_node_get(np);
                                 goto out;
@@ -902,7 +902,7 @@ int of_parse_phandle_with_args(struct device_node *np, const char *list_name,
         /* Retrieve the phandle list property */
         list = of_get_property(np, list_name, &size);
         if (!list)
-                return -EINVAL;
+                return -ENOENT;
         list_end = list + size / sizeof(*list);
 
         /* Loop over the phandles until all the requested entry is found */
@@ -1180,7 +1180,7 @@ static void of_alias_add(struct alias_prop *ap, struct device_node *np,
         ap->stem[stem_len] = 0;
         list_add_tail(&ap->link, &aliases_lookup);
         pr_debug("adding DT alias:%s: stem=%s id=%i node=%s\n",
-                 ap->alias, ap->stem, ap->id, np ? np->full_name : NULL);
+                 ap->alias, ap->stem, ap->id, of_node_full_name(np));
 }
 
 /**
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 9cf00602f56..ff8ab7b2737 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -255,7 +255,7 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
 
         skiplevel:
                 /* Iterate again with new parent */
-                pr_debug(" -> new parent: %s\n", newpar ? newpar->full_name : "<>");
+                pr_debug(" -> new parent: %s\n", of_node_full_name(newpar));
                 of_node_put(ipar);
                 ipar = newpar;
                 newpar = NULL;
diff --git a/drivers/of/of_mtd.c b/drivers/of/of_mtd.c
index e7cad627a5d..a27ec94877e 100644
--- a/drivers/of/of_mtd.c
+++ b/drivers/of/of_mtd.c
@@ -32,7 +32,7 @@ static const char *nand_ecc_modes[] = {
  * The function gets ecc mode string from property 'nand-ecc-mode',
  * and return its index in nand_ecc_modes table, or errno in error case.
  */
-const int of_get_nand_ecc_mode(struct device_node *np)
+int of_get_nand_ecc_mode(struct device_node *np)
 {
         const char *pm;
         int err, i;
diff --git a/include/linux/of.h b/include/linux/of.h
index b27c87191df..0e9cf9eec08 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -163,6 +163,11 @@ static inline int of_node_to_nid(struct device_node *np) { return -1; }
 #define of_node_to_nid of_node_to_nid
 #endif
 
+static inline const char* of_node_full_name(struct device_node *np)
+{
+        return np ? np->full_name : "<no-node>";
+}
+
 extern struct device_node *of_find_node_by_name(struct device_node *from,
         const char *name);
 #define for_each_node_by_name(dn, name) \
@@ -302,6 +307,11 @@ const char *of_prop_next_string(struct property *prop, const char *cur);
 
 #else /* CONFIG_OF */
 
+static inline const char* of_node_full_name(struct device_node *np)
+{
+        return "<no-node>";
+}
+
 static inline bool of_have_populated_dt(void)
 {
         return false;
diff --git a/include/linux/of_mtd.h b/include/linux/of_mtd.h
index bae1b6094c6..ed7f267e638 100644
--- a/include/linux/of_mtd.h
+++ b/include/linux/of_mtd.h
@@ -11,7 +11,7 @@
 
 #ifdef CONFIG_OF_MTD
 #include <linux/of.h>
-extern const int of_get_nand_ecc_mode(struct device_node *np);
+int of_get_nand_ecc_mode(struct device_node *np);
 int of_get_nand_bus_width(struct device_node *np);
 bool of_get_nand_on_flash_bbt(struct device_node *np);
 #endif
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 41c1564103f..38c5eb839c9 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -448,7 +448,7 @@ unsigned int irq_create_mapping(struct irq_domain *domain,
         }
 
         pr_debug("irq %lu on domain %s mapped to virtual irq %u\n",
-                hwirq, domain->of_node ? domain->of_node->full_name : "null", virq);
+                hwirq, of_node_full_name(domain->of_node), virq);
 
         return virq;
 }
@@ -477,7 +477,7 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
                         return intspec[0];
 #endif
                 pr_warning("no irq domain found for %s !\n",
-                           controller->full_name);
+                           of_node_full_name(controller));
                 return 0;
         }
 
@@ -725,8 +725,8 @@ static int virq_debug_show(struct seq_file *m, void *private)
                         data = irq_desc_get_chip_data(desc);
                         seq_printf(m, data ? "0x%p  " : "  %p  ", data);
 
-                        if (desc->irq_data.domain && desc->irq_data.domain->of_node)
-                                p = desc->irq_data.domain->of_node->full_name;
+                        if (desc->irq_data.domain)
+                                p = of_node_full_name(desc->irq_data.domain->of_node);
                         else
                                 p = none;
                         seq_printf(m, "%s\n", p);