[U-Boot] [PATCH] fdt: remove fdtdec_get_alias_node() function

Masahiro Yamada yamada.m at jp.panasonic.com
Fri Nov 21 11:47:08 CET 2014


The fdt_path_offset() checks an alias too.

fdtdec_get_alias_node(blob, "foo") is equivalent to
fdt_path_offset(blob, "foo").

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
---

 drivers/serial/serial-uclass.c |  2 +-
 include/fdtdec.h               | 11 -----------
 lib/fdtdec.c                   | 15 ---------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index 71f1a5c..28dccfa 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -34,7 +34,7 @@ static void serial_find_console_or_panic(void)
 	/* Check for a chosen console */
 	node = fdtdec_get_chosen_node(gd->fdt_blob, "stdout-path");
 	if (node < 0)
-		node = fdtdec_get_alias_node(gd->fdt_blob, "console");
+		node = fdt_path_offset(gd->fdt_blob, "console");
 	if (!uclass_get_device_by_of_offset(UCLASS_SERIAL, node, &cur_dev))
 		return;
 
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 4ae77be..6e01cce 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -388,17 +388,6 @@ int fdtdec_get_alias_seq(const void *blob, const char *base, int node,
 			 int *seqp);
 
 /**
- * Get the offset of the given alias node
- *
- * This looks up an alias in /aliases then finds the offset of that node.
- *
- * @param blob		Device tree blob (if NULL, then error is returned)
- * @param name		Alias name, e.g. "console"
- * @return Node offset referred to by that alias, or -ve FDT_ERR_...
- */
-int fdtdec_get_alias_node(const void *blob, const char *name);
-
-/**
  * Get the offset of the given chosen node
  *
  * This looks up a property in /chosen containing the path to another node,
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 9714620..2c9d694 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -368,21 +368,6 @@ int fdtdec_get_alias_seq(const void *blob, const char *base, int offset,
 	return -ENOENT;
 }
 
-int fdtdec_get_alias_node(const void *blob, const char *name)
-{
-	const char *prop;
-	int alias_node;
-	int len;
-
-	if (!blob)
-		return -FDT_ERR_NOTFOUND;
-	alias_node = fdt_path_offset(blob, "/aliases");
-	prop = fdt_getprop(blob, alias_node, name, &len);
-	if (!prop)
-		return -FDT_ERR_NOTFOUND;
-	return fdt_path_offset(blob, prop);
-}
-
 int fdtdec_get_chosen_node(const void *blob, const char *name)
 {
 	const char *prop;
-- 
1.9.1



More information about the U-Boot mailing list