[PATCH 10/27] libfdt: Make fdt_get_max_phandle() an inline

Sebastian Huber sebastian.huber at embedded-brains.de
Fri Feb 28 06:51:27 UTC 2020


From: David Gibson <david at gibson.dropbear.id.au>

It's now a trivial wrapper around fdt_find_max_phandle() so we might as
well inline it.  We also remove it from the versioning linker script.
Theoretically, that's a breaking ABI change except that we haven't yet
released a version with it exposed in the shared object, so we can get
away with it.

Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
---
 cpukit/dtc/libfdt/fdt_ro.c | 12 ------------
 cpukit/include/libfdt.h    | 12 +++++++++++-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/cpukit/dtc/libfdt/fdt_ro.c b/cpukit/dtc/libfdt/fdt_ro.c
index 817ac39099..2c393a100b 100644
--- a/cpukit/dtc/libfdt/fdt_ro.c
+++ b/cpukit/dtc/libfdt/fdt_ro.c
@@ -172,18 +172,6 @@ int fdt_find_max_phandle(const void *fdt, uint32_t *phandle)
 	return 0;
 }
 
-uint32_t fdt_get_max_phandle(const void *fdt)
-{
-	uint32_t phandle;
-	int err;
-
-	err = fdt_find_max_phandle(fdt, &phandle);
-	if (err < 0)
-		return (uint32_t)-1;
-
-	return phandle;
-}
-
 int fdt_generate_phandle(const void *fdt, uint32_t *phandle)
 {
 	uint32_t max;
diff --git a/cpukit/include/libfdt.h b/cpukit/include/libfdt.h
index 39ff6d5d25..1f44177f34 100644
--- a/cpukit/include/libfdt.h
+++ b/cpukit/include/libfdt.h
@@ -418,7 +418,17 @@ int fdt_find_max_phandle(const void *fdt, uint32_t *phandle);
  *      0, if no phandle was found in the device tree
  *      -1, if an error occurred
  */
-uint32_t fdt_get_max_phandle(const void *fdt);
+static inline uint32_t fdt_get_max_phandle(const void *fdt)
+{
+	uint32_t phandle;
+	int err;
+
+	err = fdt_find_max_phandle(fdt, &phandle);
+	if (err < 0)
+		return (uint32_t)-1;
+
+	return phandle;
+}
 
 /**
  * fdt_generate_phandle - return a new, unused phandle for a device tree blob
-- 
2.16.4



More information about the devel mailing list