of: fix sparse warnings in fdt, irq, reserved mem, and resolver code

sparse generates the following warnings in drivers/of/:

../drivers/of/fdt.c:63:36: warning: cast to restricted __be32
../drivers/of/fdt.c:68:33: warning: cast to restricted __be32
../drivers/of/irq.c:105:88: warning: incorrect type in initializer (different base types)
../drivers/of/irq.c:105:88:    expected restricted __be32
../drivers/of/irq.c:105:88:    got int
../drivers/of/irq.c:526:35: warning: incorrect type in assignment (different modifiers)
../drivers/of/irq.c:526:35:    expected int ( *const [usertype] irq_init_cb )( ... )
../drivers/of/irq.c:526:35:    got void const *const data
../drivers/of/of_reserved_mem.c:200:50: warning: incorrect type in initializer (different modifiers)
../drivers/of/of_reserved_mem.c:200:50:    expected int ( *[usertype] initfn )( ... )
../drivers/of/of_reserved_mem.c:200:50:    got void const *const data
../drivers/of/resolver.c:95:42: warning: incorrect type in assignment (different base types)
../drivers/of/resolver.c:95:42:    expected unsigned int [unsigned] [usertype] <noident>
../drivers/of/resolver.c:95:42:    got restricted __be32 [usertype] <noident>

All these are harmless type mismatches fixed by adjusting the types.

Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index e33f7818bc6c7b794151eeffaac810aef4add78a..a0972219ccfc5fccee139c46d9f4fd97445973e2 100644 (file)
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -48,8 +48,8 @@ void of_fdt_limit_memory(int limit)
        const void *val;
        int nr_address_cells = OF_ROOT_NODE_ADDR_CELLS_DEFAULT;
        int nr_size_cells = OF_ROOT_NODE_SIZE_CELLS_DEFAULT;
-       const uint32_t *addr_prop;
-       const uint32_t *size_prop;
+       const __be32 *addr_prop;
+       const __be32 *size_prop;
        int root_offset;
        int cell_size;
 

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 7c56b72d1dc6d1090b990402d07b4404856e1693..d11437cb118796784b2d7165e19239b76f96be62 100644 (file)
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -102,7 +102,7 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
        struct device_node *ipar, *tnode, *old = NULL, *newpar = NULL;
        __be32 initial_match_array[MAX_PHANDLE_ARGS];
        const __be32 *match_array = initial_match_array;
-       const __be32 *tmp, *imap, *imask, dummy_imask[] = { [0 ... MAX_PHANDLE_ARGS] = ~0 };
+       const __be32 *tmp, *imap, *imask, dummy_imask[] = { [0 ... MAX_PHANDLE_ARGS] = cpu_to_be32(~0) };
        u32 intsize = 1, addrsize, newintsize = 0, newaddrsize = 0;
        int imaplen, match, i, rc = -EINVAL;
 

diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index d507c3569a88acac9e796f1f172f412e5386347f..4dec07ea510f5fd67f38fa798727bdffef6c3168 100644 (file)
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -197,7 +197,7 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem)
        const struct of_device_id *i;
 
        for (i = __reservedmem_of_table; i < &__rmem_of_table_sentinel; i++) {
-               reservedmem_of_init_fn initfn = i->data;
+               int const (*initfn)(struct reserved_mem *rmem) = i->data;
                const char *compat = i->compatible;
 
                if (!of_flat_dt_is_compatible(rmem->fdt_node, compat))

diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index 7ae9863cb0a4e420d9b17256c3f9670a04c6153e..771f4844c781e76474f475fcf86bf87225e2dfd9 100644 (file)
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -92,7 +92,7 @@ static void adjust_overlay_phandles(struct device_node *overlay,
                if (phandle == OF_PHANDLE_ILLEGAL)
                        continue;
 
-               *(uint32_t *)prop->value = cpu_to_be32(overlay->phandle);
+               *(__be32 *)prop->value = cpu_to_be32(overlay->phandle);
        }
 
        for_each_child_of_node(overlay, child)

diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index 1e0deb8e849458ca179c1df4734bb24f0e4cd748..ec6b11deb77357444757691ec87d71d94b1b8953 100644 (file)
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -8,7 +8,7 @@
 #include <linux/ioport.h>
 #include <linux/of.h>
 
-typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *);
+typedef int const (*of_irq_init_cb_t)(struct device_node *, struct device_node *);
 
 /*
  * Workarounds only applied to 32bit powermac machines