commit 69ea20eda6166e574dd48240efcb6967e412c27f
author Simon Glass <sjg@chromium.org> Tue Dec 22 19:30:23 2020 -0700
committer Simon Glass <sjg@chromium.org> Tue Jan 05 12:24:40 2021 -0700
tree d9670836745e1b1f960985ad7a0edd262b111c8b
parent f03341f88efee54da207f5f1e68eaa91f6f7bd66

dm: core: Use 'uclass_driver' for the uclass linker_list

At present the name 'uclass_driver' is used for the uclass linker list.
This does not follow the convention of using the struct name. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>

drivers/core/lists.c

diff --git a/drivers/core/lists.c b/drivers/core/lists.c
index b23ee30..426444d 100644
--- a/drivers/core/lists.c
+++ b/drivers/core/lists.c
@@ -39,8 +39,8 @@
 struct uclass_driver *lists_uclass_lookup(enum uclass_id id)
 {
 	struct uclass_driver *uclass =
-		ll_entry_start(struct uclass_driver, uclass);
-	const int n_ents = ll_entry_count(struct uclass_driver, uclass);
+		ll_entry_start(struct uclass_driver, uclass_driver);
+	const int n_ents = ll_entry_count(struct uclass_driver, uclass_driver);
 	struct uclass_driver *entry;
 
 	for (entry = uclass; entry != uclass + n_ents; entry++) {

drivers/core/root.c

diff --git a/drivers/core/root.c b/drivers/core/root.c
index f2fba58..9ef2429 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -86,8 +86,8 @@
 void fix_uclass(void)
 {
 	struct uclass_driver *uclass =
-		ll_entry_start(struct uclass_driver, uclass);
-	const int n_ents = ll_entry_count(struct uclass_driver, uclass);
+		ll_entry_start(struct uclass_driver, uclass_driver);
+	const int n_ents = ll_entry_count(struct uclass_driver, uclass_driver);
 	struct uclass_driver *entry;
 
 	for (entry = uclass; entry != uclass + n_ents; entry++) {

include/dm/uclass.h

diff --git a/include/dm/uclass.h b/include/dm/uclass.h
index 91edbfb..fde08fe 100644
--- a/include/dm/uclass.h
+++ b/include/dm/uclass.h
@@ -112,7 +112,7 @@
 
 /* Declare a new uclass_driver */
 #define UCLASS_DRIVER(__name)						\
-	ll_entry_declare(struct uclass_driver, __name, uclass)
+	ll_entry_declare(struct uclass_driver, __name, uclass_driver)
 
 /**
  * uclass_get() - Get a uclass based on an ID, creating it if needed