Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2e41518 authored by Kim Phillips's avatar Kim Phillips Committed by Rob Herring
Browse files

of/irq: sparse fixes 



drivers/of/irq.c:195:57: warning: restricted __be32 degrades to integer
drivers/of/irq.c:196:51: warning: restricted __be32 degrades to integer
drivers/of/irq.c:199:57: warning: restricted __be32 degrades to integer
drivers/of/irq.c:201:58: warning: restricted __be32 degrades to integer
drivers/of/irq.c:470:37: warning: incorrect type in assignment (different modifiers)
drivers/of/irq.c:470:37:    expected int ( *[usertype] irq_init_cb )( ... )
drivers/of/irq.c:470:37:    got void const *const data
drivers/of/irq.c:96:5: error: symbol 'of_irq_map_raw' redeclared with different type (originally declared at include/linux/of_irq.h:61) - incompatible argument 2 (different base types)

drivers/of/of_pci_irq.c:91:40: warning: incorrect type in argument 2 (different base types)
drivers/of/of_pci_irq.c:91:40:    expected unsigned int const [usertype] *intspec
drivers/of/of_pci_irq.c:91:40:    got restricted __be32 *<noident>
drivers/of/of_pci_irq.c:91:53: warning: incorrect type in argument 4 (different base types)
drivers/of/of_pci_irq.c:91:53:    expected unsigned int const [usertype] *addr
drivers/of/of_pci_irq.c:91:53:    got restricted __be32 *<noident>

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
parent 47b1e689

drivers/of/irq.c

+5 −3
Original line number Diff line number Diff line
@@ -192,11 +192,13 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec, 
			/* Compare specifiers */

			match = 1;

			for (i = 0; i < addrsize && match; ++i) {

				u32 mask = imask ? imask[i] : 0xffffffffu;

				__be32 mask = imask ? imask[i]

						    : cpu_to_be32(0xffffffffu);

				match = ((addr[i] ^ imap[i]) & mask) == 0;

			}

			for (; i < (addrsize + intsize) && match; ++i) {

				u32 mask = imask ? imask[i] : 0xffffffffu;

				__be32 mask = imask ? imask[i]

						    : cpu_to_be32(0xffffffffu);

				match =

				   ((intspec[i-addrsize] ^ imap[i]) & mask) == 0;

			}
@@ -465,7 +467,7 @@ void __init of_irq_init(const struct of_device_id *matches) 
			pr_debug("of_irq_init: init %s @ %p, parent %p\n",

				 match->compatible,

				 desc->dev, desc->interrupt_parent);

			irq_init_cb = match->data;

			irq_init_cb = (of_irq_init_cb_t)match->data;

			ret = irq_init_cb(desc->dev, desc->interrupt_parent);

			if (ret) {

				kfree(desc);

include/linux/of_irq.h

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ static inline int of_irq_map_oldworld(struct device_node *device, int index, 
#endif /* CONFIG_PPC32 && CONFIG_PPC_PMAC */





extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec,

			  u32 ointsize, const u32 *addr,

extern int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,

			  u32 ointsize, const __be32 *addr,

			  struct of_irq *out_irq);

extern int of_irq_map_one(struct device_node *device, int index,

			  struct of_irq *out_irq);