Declare the variable fdt properly as extern. Call the "set_fn" function pointer the "short way" without the full dereferencing syntax.
Signed-off-by: Gerald Van Baren vanbaren@cideas.com ---
Suggestions from Wolfgang G. and Timur, respectively. Thanks, guys.
common/fdt_support.c | 5 +++++ cpu/mpc83xx/cpu.c | 2 +- include/libfdt_env.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/common/fdt_support.c b/common/fdt_support.c index bcdc415..15f133c 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -37,6 +37,11 @@ */ DECLARE_GLOBAL_DATA_PTR;
+/* + * fdt points to our working device tree. + */ +struct fdt_header *fdt; +
/********************************************************************/
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index e934ba6..6028fbf 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -462,7 +462,7 @@ ft_cpu_setup(void *blob, bd_t *bd) for (j = 0; j < (sizeof(fixup_props) / sizeof(fixup_props[0])); j++) { nodeoffset = fdt_path_offset(fdt, fixup_props[j].node); if (nodeoffset >= 0) { - err = (*fixup_props[j].set_fn)(blob, nodeoffset, fixup_props[j].prop, bd); + err = fixup_props[j].set_fn(blob, nodeoffset, fixup_props[j].prop, bd); if (err < 0) printf("set_fn/libfdt: %s %s returned %s\n", fixup_props[j].node, diff --git a/include/libfdt_env.h b/include/libfdt_env.h index e746314..78f7258 100644 --- a/include/libfdt_env.h +++ b/include/libfdt_env.h @@ -26,7 +26,7 @@ #include <asm/byteorder.h> #include <linux/string.h>
-struct fdt_header *fdt; /* Pointer to the working fdt */ +extern struct fdt_header *fdt; /* Pointer to the working fdt */
#define fdt32_to_cpu(x) __be32_to_cpu(x) #define cpu_to_fdt32(x) __cpu_to_be32(x)