5 files changed, 1 insertions, 11 deletions

diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index a09c1c3cf831..49b16f76d78e 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -207,11 +207,8 @@ static void __of_attach_node(struct device_node *np)
 
         if (!of_node_check_flag(np, OF_OVERLAY)) {
                 np->name = __of_get_property(np, "name", NULL);
-                np->type = __of_get_property(np, "device_type", NULL);
                 if (!np->name)
                         np->name = "<NULL>";
-                if (!np->type)
-                        np->type = "<NULL>";
 
                 phandle = __of_get_property(np, "phandle", &sz);
                 if (!phandle)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 7099c652c6a5..9cc1461aac7d 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -314,12 +314,8 @@ static bool populate_node(const void *blob,
         populate_properties(blob, offset, mem, np, pathp, dryrun);
         if (!dryrun) {
                 np->name = of_get_property(np, "name", NULL);
-                np->type = of_get_property(np, "device_type", NULL);
-
                 if (!np->name)
                         np->name = "<NULL>";
-                if (!np->type)
-                        np->type = "<NULL>";
         }
 
         *pnp = np;
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 2b5ac43a5690..c423e94baf0f 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -423,12 +423,9 @@ static int add_changeset_node(struct overlay_changeset *ovcs,
 
                 tchild->parent = target->np;
                 tchild->name = __of_get_property(node, "name", NULL);
-                tchild->type = __of_get_property(node, "device_type", NULL);
 
                 if (!tchild->name)
                         tchild->name = "<NULL>";
-                if (!tchild->type)
-                        tchild->type = "<NULL>";
 
                 /* ignore obsolete "linux,phandle" */
                 phandle = __of_get_property(node, "phandle", &size);
diff --git a/drivers/of/pdt.c b/drivers/of/pdt.c
index d3185063d369..7eda43c66c91 100644
--- a/drivers/of/pdt.c
+++ b/drivers/of/pdt.c
@@ -155,7 +155,6 @@ static struct device_node * __init of_pdt_create_node(phandle node,
         dp->parent = parent;
 
         dp->name = of_pdt_get_one_property(node, "name");
-        dp->type = of_pdt_get_one_property(node, "device_type");
         dp->phandle = node;
 
         dp->properties = of_pdt_build_prop_list(node);
diff --git a/drivers/of/property.c b/drivers/of/property.c
index 08430031bd28..8631efa1daa1 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -806,6 +806,7 @@ struct device_node *of_graph_get_remote_node(const struct device_node *node,
 
         if (!of_device_is_available(remote)) {
                 pr_debug("not available for remote node\n");
+                of_node_put(remote);
                 return NULL;
         }