diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-11-21 19:47:08 +0900 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-11-27 09:12:30 -0700 |
| commit | 0bd4e39d2ba477f3c274aa233f5c2e1d25dbaa74 (patch) | |
| tree | fe49a373528151bd1ab3b95f6bdbbf3a40fd32d3 | |
| parent | 85bafb6da4dddfffa78479aa49a72ae48578a4ce (diff) | |
fdt: remove fdtdec_get_alias_node() function
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@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/serial/serial-uclass.c | 2 | ||||
| -rw-r--r-- | include/fdtdec.h | 11 | ||||
| -rw-r--r-- | lib/fdtdec.c | 15 |
3 files changed, 1 insertions, 27 deletions
diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index b09053f1402..d1b5777cecd 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -39,7 +39,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, &dev)) { gd->cur_serial_dev = dev; return; diff --git a/include/fdtdec.h b/include/fdtdec.h index 3da9fab95ce..911f216cd80 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -390,17 +390,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 7c7e673aeb7..f12d6a3e7da 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -370,21 +370,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; |