of/fdt: update of_get_flat_dt_prop in prep for libfdt

Make of_get_flat_dt_prop arguments compatible with libfdt fdt_getprop
call in preparation to convert FDT code to use libfdt. Make the return
value const and the property length ptr type an int.

Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Stephen Chivers <schivers@csc.com>

1 files changed, 20 insertions, 19 deletions

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 9c8535291909..1d1582bb81fb 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -35,7 +35,7 @@ char *of_fdt_get_string(struct boot_param_header *blob, u32 offset)
  */
 void *of_fdt_get_property(struct boot_param_header *blob,
                        unsigned long node, const char *name,
-                       unsigned long *size)
+                       int *size)
 {
         unsigned long p = node;
 
@@ -85,7 +85,8 @@ int of_fdt_is_compatible(struct boot_param_header *blob,
                       unsigned long node, const char *compat)
 {
         const char *cp;
-        unsigned long cplen, l, score = 0;
+        int cplen;
+        unsigned long l, score = 0;
 
         cp = of_fdt_get_property(blob, node, "compatible", &cplen);
         if (cp == NULL)
@@ -444,8 +445,8 @@ static int __init __reserved_mem_reserve_reg(unsigned long node,
 {
         int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32);
         phys_addr_t base, size;
-        unsigned long len;
-        __be32 *prop;
+        int len;
+        const __be32 *prop;
         int nomap, first = 1;
 
         prop = of_get_flat_dt_prop(node, "reg", &len);
@@ -488,7 +489,7 @@ static int __init __reserved_mem_reserve_reg(unsigned long node,
  */
 static int __init __reserved_mem_check_root(unsigned long node)
 {
-        __be32 *prop;
+        const __be32 *prop;
 
         prop = of_get_flat_dt_prop(node, "#size-cells", NULL);
         if (!prop || be32_to_cpup(prop) != dt_root_size_cells)
@@ -638,8 +639,8 @@ unsigned long __init of_get_flat_dt_root(void)
  * This function can be used within scan_flattened_dt callback to get
  * access to properties
  */
-void *__init of_get_flat_dt_prop(unsigned long node, const char *name,
-                                 unsigned long *size)
+const void *__init of_get_flat_dt_prop(unsigned long node, const char *name,
+                                       int *size)
 {
         return of_fdt_get_property(initial_boot_params, node, name, size);
 }
@@ -710,7 +711,7 @@ const void * __init of_flat_dt_match_machine(const void *default_match,
         }
         if (!best_data) {
                 const char *prop;
-                long size;
+                int size;
 
                 pr_err("\n unrecognized device tree list:\n[ ");
 
@@ -739,8 +740,8 @@ const void * __init of_flat_dt_match_machine(const void *default_match,
 static void __init early_init_dt_check_for_initrd(unsigned long node)
 {
         u64 start, end;
-        unsigned long len;
-        __be32 *prop;
+        int len;
+        const __be32 *prop;
 
         pr_debug("Looking for initrd properties... ");
 
@@ -773,7 +774,7 @@ static inline void early_init_dt_check_for_initrd(unsigned long node)
 int __init early_init_dt_scan_root(unsigned long node, const char *uname,
                                    int depth, void *data)
 {
-        __be32 *prop;
+        const __be32 *prop;
 
         if (depth != 0)
                 return 0;
@@ -795,9 +796,9 @@ int __init early_init_dt_scan_root(unsigned long node, const char *uname,
         return 1;
 }
 
-u64 __init dt_mem_next_cell(int s, __be32 **cellp)
+u64 __init dt_mem_next_cell(int s, const __be32 **cellp)
 {
-        __be32 *p = *cellp;
+        const __be32 *p = *cellp;
 
         *cellp = p + s;
         return of_read_number(p, s);
@@ -809,9 +810,9 @@ u64 __init dt_mem_next_cell(int s, __be32 **cellp)
 int __init early_init_dt_scan_memory(unsigned long node, const char *uname,
                                      int depth, void *data)
 {
-        char *type = of_get_flat_dt_prop(node, "device_type", NULL);
-        __be32 *reg, *endp;
-        unsigned long l;
+        const char *type = of_get_flat_dt_prop(node, "device_type", NULL);
+        const __be32 *reg, *endp;
+        int l;
 
         /* We are scanning "memory" nodes only */
         if (type == NULL) {
@@ -832,7 +833,7 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname,
 
         endp = reg + (l / sizeof(__be32));
 
-        pr_debug("memory scan node %s, reg size %ld, data: %x %x %x %x,\n",
+        pr_debug("memory scan node %s, reg size %d, data: %x %x %x %x,\n",
             uname, l, reg[0], reg[1], reg[2], reg[3]);
 
         while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) {
@@ -855,8 +856,8 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname,
 int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
                                      int depth, void *data)
 {
-        unsigned long l;
-        char *p;
+        int l;
+        const char *p;
 
         pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname);