diff options
| author | Rob Herring <robh@kernel.org> | 2017-06-01 18:00:00 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-06-22 12:37:46 -0500 |
| commit | 95e6b1fa3311c8a7b151d38540695409048d1495 (patch) | |
| tree | cb945ab7cae909f835f2bc1ed134fd4628247144 | |
| parent | 8ee8a0e795e7a41078aa8eceb1dac1656975b9a6 (diff) | |
| download | lwn-95e6b1fa3311c8a7b151d38540695409048d1495.tar.gz lwn-95e6b1fa3311c8a7b151d38540695409048d1495.zip | |
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>
| -rw-r--r-- | drivers/of/base.c | 5 | ||||
| -rw-r--r-- | drivers/of/platform.c | 2 | ||||
| -rw-r--r-- | drivers/of/resolver.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 974d51269a02..74b0a27dab9f 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -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; } diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 71fecc2debfc..8f73413fa243 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -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; } } diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c index 771f4844c781..63626d7d9adb 100644 --- a/drivers/of/resolver.c +++ b/drivers/of/resolver.c @@ -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); } |