diff options
author | Ben Dooks <ben.dooks@codethink.co.uk> | 2016-06-07 08:18:30 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2016-06-12 20:48:31 -0400 |
commit | 4a3691ccb3ce627874b93c000a9cdd86784e06cb (patch) | |
tree | 75399d87777097443806e042c161bea0c67da1b4 | |
parent | 1a695a905c18548062509178b98bc91e67510864 (diff) |
irqchip/sirfsoc: Fix sparse warnings on __iomem
Fix warnings from sparse about casting to __iomem from non anotated
variable:
drivers/irqchip/irq-sirfsoc.c:56:47: warning: incorrect type in initializer (different address spaces)
drivers/irqchip/irq-sirfsoc.c:56:47: expected void [noderef] <asn:2>*base
drivers/irqchip/irq-sirfsoc.c:56:47: got void *host_data
drivers/irqchip/irq-sirfsoc.c:97:47: warning: incorrect type in initializer (different address spaces)
drivers/irqchip/irq-sirfsoc.c:97:47: expected void [noderef] <asn:2>*base
drivers/irqchip/irq-sirfsoc.c:97:47: got void *host_data
drivers/irqchip/irq-sirfsoc.c:109:47: warning: incorrect type in initializer (different address spaces)
drivers/irqchip/irq-sirfsoc.c:109:47: expected void [noderef] <asn:2>*base
drivers/irqchip/irq-sirfsoc.c:109:47: got void *host_data
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Link: https://lkml.kernel.org/r/1465301910-2308-1-git-send-email-ben.dooks@codethink.co.uk
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r-- | drivers/irqchip/irq-sirfsoc.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/irqchip/irq-sirfsoc.c b/drivers/irqchip/irq-sirfsoc.c index 10cb21b9ba3d..e1336848affa 100644 --- a/drivers/irqchip/irq-sirfsoc.c +++ b/drivers/irqchip/irq-sirfsoc.c | |||
@@ -29,6 +29,11 @@ | |||
29 | 29 | ||
30 | static struct irq_domain *sirfsoc_irqdomain; | 30 | static struct irq_domain *sirfsoc_irqdomain; |
31 | 31 | ||
32 | static void __iomem *sirfsoc_irq_get_regbase(void) | ||
33 | { | ||
34 | return (void __iomem __force *)sirfsoc_irqdomain->host_data; | ||
35 | } | ||
36 | |||
32 | static __init void sirfsoc_alloc_gc(void __iomem *base) | 37 | static __init void sirfsoc_alloc_gc(void __iomem *base) |
33 | { | 38 | { |
34 | unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN; | 39 | unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN; |
@@ -53,7 +58,7 @@ static __init void sirfsoc_alloc_gc(void __iomem *base) | |||
53 | 58 | ||
54 | static void __exception_irq_entry sirfsoc_handle_irq(struct pt_regs *regs) | 59 | static void __exception_irq_entry sirfsoc_handle_irq(struct pt_regs *regs) |
55 | { | 60 | { |
56 | void __iomem *base = sirfsoc_irqdomain->host_data; | 61 | void __iomem *base = sirfsoc_irq_get_regbase(); |
57 | u32 irqstat; | 62 | u32 irqstat; |
58 | 63 | ||
59 | irqstat = readl_relaxed(base + SIRFSOC_INIT_IRQ_ID); | 64 | irqstat = readl_relaxed(base + SIRFSOC_INIT_IRQ_ID); |
@@ -94,7 +99,7 @@ static struct sirfsoc_irq_status sirfsoc_irq_st; | |||
94 | 99 | ||
95 | static int sirfsoc_irq_suspend(void) | 100 | static int sirfsoc_irq_suspend(void) |
96 | { | 101 | { |
97 | void __iomem *base = sirfsoc_irqdomain->host_data; | 102 | void __iomem *base = sirfsoc_irq_get_regbase(); |
98 | 103 | ||
99 | sirfsoc_irq_st.mask0 = readl_relaxed(base + SIRFSOC_INT_RISC_MASK0); | 104 | sirfsoc_irq_st.mask0 = readl_relaxed(base + SIRFSOC_INT_RISC_MASK0); |
100 | sirfsoc_irq_st.mask1 = readl_relaxed(base + SIRFSOC_INT_RISC_MASK1); | 105 | sirfsoc_irq_st.mask1 = readl_relaxed(base + SIRFSOC_INT_RISC_MASK1); |
@@ -106,7 +111,7 @@ static int sirfsoc_irq_suspend(void) | |||
106 | 111 | ||
107 | static void sirfsoc_irq_resume(void) | 112 | static void sirfsoc_irq_resume(void) |
108 | { | 113 | { |
109 | void __iomem *base = sirfsoc_irqdomain->host_data; | 114 | void __iomem *base = sirfsoc_irq_get_regbase(); |
110 | 115 | ||
111 | writel_relaxed(sirfsoc_irq_st.mask0, base + SIRFSOC_INT_RISC_MASK0); | 116 | writel_relaxed(sirfsoc_irq_st.mask0, base + SIRFSOC_INT_RISC_MASK0); |
112 | writel_relaxed(sirfsoc_irq_st.mask1, base + SIRFSOC_INT_RISC_MASK1); | 117 | writel_relaxed(sirfsoc_irq_st.mask1, base + SIRFSOC_INT_RISC_MASK1); |