[U-Boot-Users] [PATCH 9/17] Replace fdt_node_offset() with fdt_find_node_by_path().

[Grant Likely]

On 7/4/07, Jerry Van Baren <gvb.uboot at gmail.com> wrote:
> The new name matches more closely the kernel's name, which is also
> a much better description.
>
> Signed-off-by: Wolfgang Grandegger <wg at grandegger.com>
> Acked-by: Gerald Van Baren <vanbaren at cideas.com>
Acked-by: Grant Likely <grant.likely at secretlab.ca>

> ---
>  common/cmd_fdt.c     |    2 +-
>  common/fdt_support.c |   10 +++++-----
>  include/libfdt.h     |    2 +-
>  libfdt/fdt_ro.c      |    2 +-
>  4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
> index bf0aef7..5a2c3fd 100644
> --- a/common/cmd_fdt.c
> +++ b/common/cmd_fdt.c
> @@ -59,7 +59,7 @@ static int findnodeoffset(const char *pathp)
>         if (strcmp(pathp, "/") == 0) {
>                 nodeoffset = 0;
>         } else {
> -               nodeoffset = fdt_path_offset (fdt, pathp);
> +               nodeoffset = fdt_find_node_by_path (fdt, pathp);
>                 if (nodeoffset < 0) {
>                         /*
>                          * Not found or something else bad happened.
> diff --git a/common/fdt_support.c b/common/fdt_support.c
> index 15f133c..efa63f0 100644
> --- a/common/fdt_support.c
> +++ b/common/fdt_support.c
> @@ -97,7 +97,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
>         /*
>          * Find the "chosen" node.
>          */
> -       nodeoffset = fdt_path_offset (fdt, "/chosen");
> +       nodeoffset = fdt_find_node_by_path (fdt, "/chosen");
>
>         /*
>          * If we have a "chosen" node already the "force the writing"
> @@ -145,7 +145,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
>                 printf("WARNING fdt_chosen: could not set \"linux,stdout-path\" (libfdt error %s).\n", fdt_strerror(err));
>  #endif
>
> -       nodeoffset = fdt_path_offset (fdt, "/cpus");
> +       nodeoffset = fdt_find_node_by_path (fdt, "/cpus");
>         if (nodeoffset >= 0) {
>                 clock = cpu_to_be32(bd->bi_intfreq);
>                 err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4);
> @@ -153,7 +153,7 @@ int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
>                         printf("WARNING fdt_chosen: could not set \"clock-frequency\" (libfdt error %s).\n", fdt_strerror(err));
>         }
>  #ifdef OF_TBCLK
> -       nodeoffset = fdt_path_offset (fdt, "/cpus/" OF_CPU "/timebase-frequency");
> +       nodeoffset = fdt_find_node_by_path (fdt, "/cpus/" OF_CPU "/timebase-frequency");
>         if (nodeoffset >= 0) {
>                 clock = cpu_to_be32(OF_TBCLK);
>                 err = fdt_setprop(fdt, nodeoffset, "clock-frequency", &clock, 4);
> @@ -190,7 +190,7 @@ int fdt_env(void *fdt)
>          * See if we already have a "u-boot-env" node, delete it if so.
>          * Then create a new empty node.
>          */
> -       nodeoffset = fdt_path_offset (fdt, "/u-boot-env");
> +       nodeoffset = fdt_find_node_by_path (fdt, "/u-boot-env");
>         if (nodeoffset >= 0) {
>                 err = fdt_del_node(fdt, nodeoffset);
>                 if (err < 0) {
> @@ -310,7 +310,7 @@ int fdt_bd_t(void *fdt)
>          * See if we already have a "bd_t" node, delete it if so.
>          * Then create a new empty node.
>          */
> -       nodeoffset = fdt_path_offset (fdt, "/bd_t");
> +       nodeoffset = fdt_find_node_by_path (fdt, "/bd_t");
>         if (nodeoffset >= 0) {
>                 err = fdt_del_node(fdt, nodeoffset);
>                 if (err < 0) {
> diff --git a/include/libfdt.h b/include/libfdt.h
> index f8bac73..e080028 100644
> --- a/include/libfdt.h
> +++ b/include/libfdt.h
> @@ -77,7 +77,7 @@ int fdt_subnode_offset_namelen(const void *fdt, int parentoffset,
>                                const char *name, int namelen);
>  int fdt_subnode_offset(const void *fdt, int parentoffset, const char *name);
>
> -int fdt_path_offset(const void *fdt, const char *path);
> +int fdt_find_node_by_path(const void *fdt, const char *path);
>
>  struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset,
>                                       const char *name, int *lenp);
> diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c
> index defe59c..1a03109 100644
> --- a/libfdt/fdt_ro.c
> +++ b/libfdt/fdt_ro.c
> @@ -132,7 +132,7 @@ int fdt_subnode_offset(const void *fdt, int parentoffset,
>   * Searches for the node corresponding to the given path and returns the
>   * offset of that node.
>   */
> -int fdt_path_offset(const void *fdt, const char *path)
> +int fdt_find_node_by_path(const void *fdt, const char *path)
>  {
>         const char *end = path + strlen(path);
>         const char *p = path;
> --
> 1.4.4.4
>
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by DB2 Express
> Download DB2 Express C - the FREE version of DB2 express and take
> control of your XML. No limits. Just data. Click to get it now.
> http://sourceforge.net/powerbar/db2/
> _______________________________________________
> U-Boot-Users mailing list
> U-Boot-Users at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/u-boot-users
>


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely at secretlab.ca
(403) 399-0195