[PATCH v2 11/13] common: cdev-alias: rename struct

Sascha Hauer s.hauer at pengutronix.de
Tue Dec 9 04:51:30 PST 2025


We'll introduce a globally available struct cdev_alias in the next step,
so rename struct cdev_alias in common/cdev-alias.c to avoid name
conflicts.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 common/cdev-alias.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/cdev-alias.c b/common/cdev-alias.c
index 329ba9e97c16fe7a90d09c0bb31ef3359b72b5d0..e5a059ad7f4d9bc447c44072c5c7744051d12a0e 100644
--- a/common/cdev-alias.c
+++ b/common/cdev-alias.c
@@ -11,13 +11,13 @@
 #include <driver.h>
 #include <init.h>
 
-struct cdev_alias {
+struct cdev_alias_res {
 	const char *name;
-	int (*resolve)(struct cdev_alias *, const char *arg,
+	int (*resolve)(struct cdev_alias_res *, const char *arg,
 		       cdev_alias_processor_t fn, void *data);
 };
 
-static int cdev_alias_resolve_bootsource(struct cdev_alias *cdev_alias,
+static int cdev_alias_resolve_bootsource(struct cdev_alias_res *cdev_alias_res,
 					 const char *partname,
 					 cdev_alias_processor_t fn,
 					 void *data)
@@ -37,7 +37,7 @@ static int cdev_alias_resolve_bootsource(struct cdev_alias *cdev_alias,
 	return fn(cdev, data);
 }
 
-static int cdev_alias_resolve_diskuuid(struct cdev_alias *cdev_alias,
+static int cdev_alias_resolve_diskuuid(struct cdev_alias_res *cdev_alias_res,
 				       const char *uuid,
 				       cdev_alias_processor_t fn,
 				       void *data)
@@ -67,7 +67,7 @@ static int cdev_alias_resolve_diskuuid(struct cdev_alias *cdev_alias,
 	return 0;
 }
 
-static struct cdev_alias cdev_alias_aliases[] = {
+static struct cdev_alias_res cdev_alias_aliases[] = {
 	{ "bootsource", cdev_alias_resolve_bootsource },
 	{ "diskuuid", cdev_alias_resolve_diskuuid },
 	{ /* sentinel */}
@@ -76,7 +76,7 @@ static struct cdev_alias cdev_alias_aliases[] = {
 int cdev_alias_resolve_for_each(const char *name,
 				cdev_alias_processor_t fn, void *data)
 {
-	struct cdev_alias *alias;
+	struct cdev_alias_res *alias;
 	int ret = 0;
 	char *buf, *arg;
 

-- 
2.47.3




More information about the barebox mailing list