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: Andy Shevchenko <andy.shevhchenko@gmail.com> Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Родитель
8ee8a0e795
Коммит
95e6b1fa33
|
@ -773,10 +773,7 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent,
|
|||
return NULL;
|
||||
|
||||
__for_each_child_of_node(parent, child) {
|
||||
const char *name = strrchr(child->full_name, '/');
|
||||
if (WARN(!name, "malformed device_node %s\n", child->full_name))
|
||||
continue;
|
||||
name++;
|
||||
const char *name = kbasename(child->full_name);
|
||||
if (strncmp(path, name, len) == 0 && (strlen(name) == len))
|
||||
return child;
|
||||
}
|
||||
|
|
|
@ -99,7 +99,7 @@ static void of_device_make_bus_id(struct device *dev)
|
|||
|
||||
/* format arguments only used if dev_name() resolves to NULL */
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -165,8 +165,8 @@ err_fail:
|
|||
static int node_name_cmp(const struct device_node *dn1,
|
||||
const struct device_node *dn2)
|
||||
{
|
||||
const char *n1 = strrchr(dn1->full_name, '/') ? : "/";
|
||||
const char *n2 = strrchr(dn2->full_name, '/') ? : "/";
|
||||
const char *n1 = kbasename(dn1->full_name);
|
||||
const char *n2 = kbasename(dn2->full_name);
|
||||
|
||||
return of_node_cmp(n1, n2);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче