Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux

Pull devicetree updates from Rob Herring:
 "A small set of changes for devicetree:
   - Couple of Documentation fixes
   - Addition of new helper function of_node_full_name
   - Improve of_parse_phandle_with_args return values
   - Some NULL related sparse fixes"

Grant's busy packing.

* tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux:
  of: mtd: nuke useless const qualifier
  devicetree: add helper inline for retrieving a node's full name
  of: return -ENOENT when no property
  usage-model.txt: fix typo machine_init->init_machine
  of: Fix null pointer related warnings in base.c file
  LED: Fix missing semicolon in OF documentation
  of: fix a few typos in the binding documentation

3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index a14f109dcd13..c181b94abc36 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 9cf00602f566..ff8ab7b27373 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 e7cad627a5d1..a27ec94877e4 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;