diff options
| author | Simon Glass <sjg@chromium.org> | 2016-10-02 17:59:30 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-10-13 14:12:40 -0600 |
| commit | 42b7600d62ae288a8c12431d232b89b26ec61721 (patch) | |
| tree | a2253e2280d8f2df7a60099cc117d7caf2d2c1bf | |
| parent | df87e6b1b815ae3484ea2aa7c53b90af382eae1b (diff) | |
libfdt: Drop inlining of fdt_path_offset()
The fdt_path_offset() function is not inlined in upstream libfdt. Adjust
U-Boot's version to match.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | include/libfdt.h | 5 | ||||
| -rw-r--r-- | lib/libfdt/fdt_ro.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/libfdt.h b/include/libfdt.h index 398748c5c4..8746790a25 100644 --- a/include/libfdt.h +++ b/include/libfdt.h @@ -410,10 +410,7 @@ int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen); * -FDT_ERR_BADSTRUCTURE, * -FDT_ERR_TRUNCATED, standard meanings. */ -static inline int fdt_path_offset(const void *fdt, const char *path) -{ - return fdt_path_offset_namelen(fdt, path, strlen(path)); -} +int fdt_path_offset(const void *fdt, const char *path); /** * fdt_get_name - retrieve the name of a given node diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c index e38aaa4ccf..7e894b742b 100644 --- a/lib/libfdt/fdt_ro.c +++ b/lib/libfdt/fdt_ro.c @@ -204,6 +204,11 @@ int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen) return offset; } +int fdt_path_offset(const void *fdt, const char *path) +{ + return fdt_path_offset_namelen(fdt, path, strlen(path)); +} + const char *fdt_get_name(const void *fdt, int nodeoffset, int *len) { const struct fdt_node_header *nh = _fdt_offset_ptr(fdt, nodeoffset); |