mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
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 <frowand.list@gmail.com> Cc: devicetree@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
parent
bfeffd1552
commit
8ce5f84157
@ -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)
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user