| Message ID | 20160705082646.25044-8-maxime.ripard@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | 6f5f92c60b7cc86bcfbd4acd310c5efbb6b68a8f |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Jul 05, 2016 at 10:26:40AM +0200, Maxime Ripard wrote: > The function fdt_path_next_seperator had an obvious mispell. Fix it. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Huh.. this entire function appears not to be in upstream libfdt. > --- > lib/libfdt/fdt_ro.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c > index 503150ef1dc5..6b737b211d2e 100644 > --- a/lib/libfdt/fdt_ro.c > +++ b/lib/libfdt/fdt_ro.c > @@ -140,12 +140,12 @@ int fdt_subnode_offset(const void *fdt, int parentoffset, > } > > /* > - * Find the next of path seperator, note we need to search for both '/' and ':' > + * Find the next of path separator, note we need to search for both '/' and ':' > * and then take the first one so that we do the right thing for e.g. > * "foo/bar:option" and "bar:option/otheroption", both of which happen, so > * first searching for either ':' or '/' does not work. > */ > -static const char *fdt_path_next_seperator(const char *path) > +static const char *fdt_path_next_separator(const char *path) > { > const char *sep1 = strchr(path, '/'); > const char *sep2 = strchr(path, ':'); > @@ -168,7 +168,7 @@ int fdt_path_offset(const void *fdt, const char *path) > > /* see if we have an alias */ > if (*path != '/') { > - const char *q = fdt_path_next_seperator(path); > + const char *q = fdt_path_next_separator(path); > > if (!q) > q = end; > @@ -188,7 +188,7 @@ int fdt_path_offset(const void *fdt, const char *path) > p++; > if (*p == '\0' || *p == ':') > return offset; > - q = fdt_path_next_seperator(p); > + q = fdt_path_next_separator(p); > if (!q) > q = end; >
Hi David, On Wed, Jul 06, 2016 at 11:16:41AM +1000, David Gibson wrote: > On Tue, Jul 05, 2016 at 10:26:40AM +0200, Maxime Ripard wrote: > > The function fdt_path_next_seperator had an obvious mispell. Fix it. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > Huh.. this entire function appears not to be in upstream libfdt. Indeed, it was introduced in this commit: http://git.denx.de/?p=u-boot.git;a=commit;h=77d7fff8cec2652be8c2494b6b66d14a398ec860 I have no idea why it wasn't upstreamed. I'll make it part of my serie for libfdt. Maxime
On Tue, Jul 05, 2016 at 10:26:40AM +0200, Maxime Ripard wrote: > The function fdt_path_next_seperator had an obvious mispell. Fix it. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Applied to u-boot/master, thanks!
diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c index 503150ef1dc5..6b737b211d2e 100644 --- a/lib/libfdt/fdt_ro.c +++ b/lib/libfdt/fdt_ro.c @@ -140,12 +140,12 @@ int fdt_subnode_offset(const void *fdt, int parentoffset, } /* - * Find the next of path seperator, note we need to search for both '/' and ':' + * Find the next of path separator, note we need to search for both '/' and ':' * and then take the first one so that we do the right thing for e.g. * "foo/bar:option" and "bar:option/otheroption", both of which happen, so * first searching for either ':' or '/' does not work. */ -static const char *fdt_path_next_seperator(const char *path) +static const char *fdt_path_next_separator(const char *path) { const char *sep1 = strchr(path, '/'); const char *sep2 = strchr(path, ':'); @@ -168,7 +168,7 @@ int fdt_path_offset(const void *fdt, const char *path) /* see if we have an alias */ if (*path != '/') { - const char *q = fdt_path_next_seperator(path); + const char *q = fdt_path_next_separator(path); if (!q) q = end; @@ -188,7 +188,7 @@ int fdt_path_offset(const void *fdt, const char *path) p++; if (*p == '\0' || *p == ':') return offset; - q = fdt_path_next_seperator(p); + q = fdt_path_next_separator(p); if (!q) q = end;
The function fdt_path_next_seperator had an obvious mispell. Fix it. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- lib/libfdt/fdt_ro.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)