devicetree-compiler.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
To: U-Boot Mailing List <u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org>
Cc: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
	Devicetree Compiler
	<devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: [PATCH 6/6] libfdt: Drop inlining of fdt_path_offset()
Date: Sun,  2 Oct 2016 17:59:30 -0600	[thread overview]
Message-ID: <1475452771-16230-7-git-send-email-sjg@chromium.org> (raw)
In-Reply-To: <1475452771-16230-1-git-send-email-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>

The fdt_path_offset() function is not inlined in upstream libfdt. Adjust
U-Boot's version to match.

Signed-off-by: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
---

 include/libfdt.h    | 5 +----
 lib/libfdt/fdt_ro.c | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/libfdt.h b/include/libfdt.h
index 398748c..8746790 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 e38aaa4..7e894b7 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);
-- 
2.8.0.rc3.226.g39d4020

  parent reply	other threads:[~2016-10-02 23:59 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-02 23:59 [PATCH 0/6] libfdt: Sync to upstream Simon Glass
     [not found] ` <1475452771-16230-1-git-send-email-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2016-10-02 23:59   ` [PATCH 2/6] libfdt: Fix undefined behaviour in fdt_offset_ptr() Simon Glass
2016-10-02 23:59   ` [PATCH 3/6] libfdt: Sync up with upstream Simon Glass
2016-10-02 23:59   ` [PATCH 4/6] libfdt: Bring in upstream stringlist functions Simon Glass
2016-10-02 23:59   ` [PATCH 5/6] libfdt: Sync fdt_for_each_subnode() with upstream Simon Glass
2016-10-02 23:59   ` Simon Glass [this message]
2016-10-06 13:53   ` [PATCH 0/6] libfdt: Sync to upstream Maxime Ripard
2016-10-06 14:36     ` Simon Glass
     [not found]       ` <CAPnjgZ07Ab8fX2ZNUikjKxenzvswdkzdn1-8uiTDqNp3Um2sQw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-10-06 21:06         ` Maxime Ripard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1475452771-16230-7-git-send-email-sjg@chromium.org \
    --to=sjg-f7+t8e8rja9g9huczpvpmw@public.gmane.org \
    --cc=devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).