fdt_support: make fdt_fixup_mtdparts() prototype more specific

The second argument of fdt_fixup_mtdparts() is an opaque pointer,
'void *node_info', hence callers can pass any pointer.

Obviously, fdt_fixup_mtdparts() expects 'struct node_info *'
otherwise, it crashes run-time.

Change the prototype so that it is compile-time checked.

Also, add 'const' qualifier to it so that callers can constify
the struct node_info arrays.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 812eca8173ba91c2f14cc698600ba1d069a07cf1..3b31f3d7d521dc8f9c34835bf0707e02bdf1b0bb 100644 (file)
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -893,9 +893,9 @@ err_prop:
  *
  *     fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
  */
-void fdt_fixup_mtdparts(void *blob, void *node_info, int node_info_size)
+void fdt_fixup_mtdparts(void *blob, const struct node_info *node_info,
+                       int node_info_size)
 {
-       struct node_info *ni = node_info;
        struct mtd_device *dev;
        int i, idx;
        int noff;
@@ -905,12 +905,13 @@ void fdt_fixup_mtdparts(void *blob, void *node_info, int node_info_size)
 
        for (i = 0; i < node_info_size; i++) {
                idx = 0;
-               noff = fdt_node_offset_by_compatible(blob, -1, ni[i].compat);
+               noff = fdt_node_offset_by_compatible(blob, -1,
+                                                    node_info[i].compat);
                while (noff != -FDT_ERR_NOTFOUND) {
                        debug("%s: %s, mtd dev type %d\n",
                                fdt_get_name(blob, noff, 0),
-                               ni[i].compat, ni[i].type);
-                       dev = device_find(ni[i].type, idx++);
+                               node_info[i].compat, node_info[i].type);
+                       dev = device_find(node_info[i].type, idx++);
                        if (dev) {
                                if (fdt_node_set_part_info(blob, noff, dev))
                                        return; /* return on error */
@@ -918,7 +919,7 @@ void fdt_fixup_mtdparts(void *blob, void *node_info, int node_info_size)
 
                        /* Jump to next flash node */
                        noff = fdt_node_offset_by_compatible(blob, noff,
-                                                            ni[i].compat);
+                                                            node_info[i].compat);
                }
        }
 }

diff --git a/include/fdt_support.h b/include/fdt_support.h
index a9a0078af6635cc1969d389f0262d67a44474290..27fe564f0b6b497c21b4e628ecf155454014dac2 100644 (file)
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -205,11 +205,16 @@ int fdt_increase_size(void *fdt, int add_len);
 
 int fdt_fixup_nor_flash_size(void *blob);
 
+struct node_info;
 #if defined(CONFIG_FDT_FIXUP_PARTITIONS)
-void fdt_fixup_mtdparts(void *fdt, void *node_info, int node_info_size);
+void fdt_fixup_mtdparts(void *fdt, const struct node_info *node_info,
+                       int node_info_size);
 #else
-static inline void fdt_fixup_mtdparts(void *fdt, void *node_info,
-                                       int node_info_size) {}
+static inline void fdt_fixup_mtdparts(void *fdt,
+                                     const struct node_info *node_info,
+                                     int node_info_size)
+{
+}
 #endif
 
 void fdt_del_node_and_alias(void *blob, const char *alias);