Commit df9a20b3 authored by Russell King's avatar Russell King

[ARM] Fix sparse warnings for Integrator builds.

Add some missing __iomem annotations for Integrator machines.
Signed-off-by: default avatarRussell King <rmk@arm.linux.org.uk>
parent fc6de305
...@@ -35,7 +35,7 @@ module_param_named(lmid, module_id, int, 0444); ...@@ -35,7 +35,7 @@ module_param_named(lmid, module_id, int, 0444);
MODULE_PARM_DESC(lmid, "logic module stack position"); MODULE_PARM_DESC(lmid, "logic module stack position");
struct impd1_module { struct impd1_module {
void *base; void __iomem *base;
struct clk vcos[2]; struct clk vcos[2];
}; };
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#define RTC_CR_MIE (1 << 0) #define RTC_CR_MIE (1 << 0)
extern int (*set_rtc)(void); extern int (*set_rtc)(void);
static void *rtc_base; static void __iomem *rtc_base;
static int integrator_set_rtc(void) static int integrator_set_rtc(void)
{ {
...@@ -118,7 +118,7 @@ static int rtc_probe(struct amba_device *dev, void *id) ...@@ -118,7 +118,7 @@ static int rtc_probe(struct amba_device *dev, void *id)
xtime.tv_sec = __raw_readl(rtc_base + RTC_DR); xtime.tv_sec = __raw_readl(rtc_base + RTC_DR);
ret = request_irq(dev->irq[0], rtc_interrupt, SA_INTERRUPT, ret = request_irq(dev->irq[0], rtc_interrupt, SA_INTERRUPT,
"rtc-pl030", rtc_base); "rtc-pl030", dev);
if (ret) if (ret)
goto map_out; goto map_out;
...@@ -130,7 +130,7 @@ static int rtc_probe(struct amba_device *dev, void *id) ...@@ -130,7 +130,7 @@ static int rtc_probe(struct amba_device *dev, void *id)
return 0; return 0;
irq_out: irq_out:
free_irq(dev->irq[0], rtc_base); free_irq(dev->irq[0], dev);
map_out: map_out:
iounmap(rtc_base); iounmap(rtc_base);
rtc_base = NULL; rtc_base = NULL;
...@@ -146,7 +146,7 @@ static int rtc_remove(struct amba_device *dev) ...@@ -146,7 +146,7 @@ static int rtc_remove(struct amba_device *dev)
writel(0, rtc_base + RTC_CR); writel(0, rtc_base + RTC_CR);
free_irq(dev->irq[0], rtc_base); free_irq(dev->irq[0], dev);
unregister_rtc(&rtc_ops); unregister_rtc(&rtc_ops);
iounmap(rtc_base); iounmap(rtc_base);
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
struct amba_kmi_port { struct amba_kmi_port {
struct serio *io; struct serio *io;
struct clk *clk; struct clk *clk;
unsigned char *base; void __iomem *base;
unsigned int irq; unsigned int irq;
unsigned int divisor; unsigned int divisor;
unsigned int open; unsigned int open;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment