dm: core: Rename and fix uclass_get_by_name_len()

It seems that namelen is more common in U-Boot. Rename this function to
fit in better. Also fix a bug where it breaks the operation of
uclass_get_by_name() and add a test.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reported-by: Tim Harvey <tharvey@gateworks.com>

diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 2578803b7a4d8f7a3eac1f4530284c1e6d11d943..4b9b54f0f159bcca2fcec20c292b769bc6529240 100644 (file)
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -180,14 +180,15 @@ void uclass_set_priv(struct uclass *uc, void *priv)
        uc->priv_ = priv;
 }
 
-enum uclass_id uclass_get_by_name_len(const char *name, int len)
+enum uclass_id uclass_get_by_namelen(const char *name, int len)
 {
        int i;
 
        for (i = 0; i < UCLASS_COUNT; i++) {
                struct uclass_driver *uc_drv = lists_uclass_lookup(i);
 
-               if (uc_drv && !strncmp(uc_drv->name, name, len))
+               if (uc_drv && !strncmp(uc_drv->name, name, len) &&
+                   strlen(uc_drv->name) == len)
                        return i;
        }
 
@@ -196,7 +197,7 @@ enum uclass_id uclass_get_by_name_len(const char *name, int len)
 
 enum uclass_id uclass_get_by_name(const char *name)
 {
-       return uclass_get_by_name_len(name, strlen(name));
+       return uclass_get_by_namelen(name, strlen(name));
 }
 
 int dev_get_uclass_index(struct udevice *dev, struct uclass **ucp)

diff --git a/include/dm/uclass.h b/include/dm/uclass.h
index aafe65228864104dec00b19aa07319bdfbda5f0e..f6c0110b061806c514f0886e21f5f58e46db53fc 100644 (file)
--- a/include/dm/uclass.h
+++ b/include/dm/uclass.h
@@ -173,13 +173,13 @@ int uclass_get(enum uclass_id key, struct uclass **ucp);
 const char *uclass_get_name(enum uclass_id id);
 
 /**
- * uclass_get_by_name_len() - Look up a uclass by its partial driver name
+ * uclass_get_by_namelen() - Look up a uclass by its driver name
  *
  * @name: Name to look up
- * @len: Length of the partial name
+ * @len: Length of @name (the uclass driver name must have the same length)
  * Return: the associated uclass ID, or UCLASS_INVALID if not found
  */
-enum uclass_id uclass_get_by_name_len(const char *name, int len);
+enum uclass_id uclass_get_by_namelen(const char *name, int len);
 
 /**
  * uclass_get_by_name() - Look up a uclass by its driver name

diff --git a/test/dm/core.c b/test/dm/core.c
index 0ce0b3c4a2eb7979640873d3981bceb19616364c..2c73ecf54a0e7d4ef01f59ea69c654377d19fa17 100644 (file)
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -1161,6 +1161,8 @@ static int dm_test_uclass_names(struct unit_test_state *uts)
        ut_asserteq_str("test", uclass_get_name(UCLASS_TEST));
        ut_asserteq(UCLASS_TEST, uclass_get_by_name("test"));
 
+       ut_asserteq(UCLASS_SPI, uclass_get_by_name("spi"));
+
        return 0;
 }
 DM_TEST(dm_test_uclass_names, UT_TESTF_SCAN_PDATA);