of: Remove struct device_node.type pointer

PATCH New Rob Herring 1 participant 1 message Dec 17, 2018 Device tree

lore

Share & tools

lore

Rob Herring

author maintainer

2018-12-17 17:28 UTC #0 lore raw

PATCH 1/1 of: Remove struct device_node.type pointer

Now that all users of device_node.type pointer have been removed in favor of accessor functions, we can remove it.

Cc Frank Rowand <[email protected]>

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
All the dependencies for this are in linux-next now. I plan to apply and send this at the end of the merge window.

Rob

 drivers/of/dynamic.c | 3 ---
 drivers/of/fdt.c     | 4 ----
 drivers/of/overlay.c | 3 ---
 drivers/of/pdt.c     | 1 -
 include/linux/of.h   | 1 -
 5 files changed, 12 deletions(-)

drivers/of/dynamic.c +0 -3

index b4e5b90cb314..ae04a138a729 100644
@@ -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)

drivers/of/fdt.c +0 -4

index 7099c652c6a5..9cc1461aac7d 100644
@@ -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;

drivers/of/overlay.c +0 -3

index 2b5ac43a5690..c423e94baf0f 100644
@@ -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);

drivers/of/pdt.c +0 -1

index d3185063d369..7eda43c66c91 100644
@@ -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);

include/linux/of.h +0 -1

index fe472e5195a9..e240992e5cb6 100644
@@ -50,7 +50,6 @@ struct of_irq_controller;
 
 struct device_node {
 	const char *name;
-	const char *type;
 	phandle phandle;
 	const char *full_name;
 	struct fwnode_handle fwnode;

Signature · 1 line

2.19.1