Commit 95e6b1fa authored by Rob Herring's avatar Rob Herring

of: use kbasename instead of open coding

Several places in DT code open code the equivalent of kbasename.
Replace them.

The behavior for root nodes in node_name_cmp will be slightly different.
Instead of comparing "/", "" will be compared. The comparison will be
the same.
Reviewed-by: default avatarAndy Shevchenko <andy.shevhchenko@gmail.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 8ee8a0e7
...@@ -773,10 +773,7 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent, ...@@ -773,10 +773,7 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent,
return NULL; return NULL;
__for_each_child_of_node(parent, child) { __for_each_child_of_node(parent, child) {
const char *name = strrchr(child->full_name, '/'); const char *name = kbasename(child->full_name);
if (WARN(!name, "malformed device_node %s\n", child->full_name))
continue;
name++;
if (strncmp(path, name, len) == 0 && (strlen(name) == len)) if (strncmp(path, name, len) == 0 && (strlen(name) == len))
return child; return child;
} }
......
...@@ -99,7 +99,7 @@ static void of_device_make_bus_id(struct device *dev) ...@@ -99,7 +99,7 @@ static void of_device_make_bus_id(struct device *dev)
/* format arguments only used if dev_name() resolves to NULL */ /* format arguments only used if dev_name() resolves to NULL */
dev_set_name(dev, dev_name(dev) ? "%s:%s" : "%s", dev_set_name(dev, dev_name(dev) ? "%s:%s" : "%s",
strrchr(node->full_name, '/') + 1, dev_name(dev)); kbasename(node->full_name), dev_name(dev));
node = node->parent; node = node->parent;
} }
} }
......
...@@ -165,8 +165,8 @@ static int update_usages_of_a_phandle_reference(struct device_node *overlay, ...@@ -165,8 +165,8 @@ static int update_usages_of_a_phandle_reference(struct device_node *overlay,
static int node_name_cmp(const struct device_node *dn1, static int node_name_cmp(const struct device_node *dn1,
const struct device_node *dn2) const struct device_node *dn2)
{ {
const char *n1 = strrchr(dn1->full_name, '/') ? : "/"; const char *n1 = kbasename(dn1->full_name);
const char *n2 = strrchr(dn2->full_name, '/') ? : "/"; const char *n2 = kbasename(dn2->full_name);
return of_node_cmp(n1, n2); return of_node_cmp(n1, n2);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment