diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-09-11 08:27:25 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-09-21 14:04:39 -0400 |
commit | e96a0309f8545d539c1bf4acd5b58727a8f39818 (patch) | |
tree | 275af35c4378ce5b4fd0ed724319f027b13989b5 /arch/arm/plat-orion/time.c | |
parent | 5a2f55019391218d8c08c6f9d32591d91200de77 (diff) |
arm: plat-orion: use void __iomem pointers for time functions
The functions for time management now take void __iomem pointers, so
we remove the temporary "unsigned long" casts from the mach-*/common.c
files.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/plat-orion/time.c')
-rw-r--r-- | arch/arm/plat-orion/time.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c index 1ed8d1397fc..0f4fa863dd5 100644 --- a/arch/arm/plat-orion/time.c +++ b/arch/arm/plat-orion/time.c | |||
@@ -180,13 +180,13 @@ static struct irqaction orion_timer_irq = { | |||
180 | }; | 180 | }; |
181 | 181 | ||
182 | void __init | 182 | void __init |
183 | orion_time_set_base(u32 _timer_base) | 183 | orion_time_set_base(void __iomem *_timer_base) |
184 | { | 184 | { |
185 | timer_base = (void __iomem *)_timer_base; | 185 | timer_base = _timer_base; |
186 | } | 186 | } |
187 | 187 | ||
188 | void __init | 188 | void __init |
189 | orion_time_init(u32 _bridge_base, u32 _bridge_timer1_clr_mask, | 189 | orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask, |
190 | unsigned int irq, unsigned int tclk) | 190 | unsigned int irq, unsigned int tclk) |
191 | { | 191 | { |
192 | u32 u; | 192 | u32 u; |
@@ -194,7 +194,7 @@ orion_time_init(u32 _bridge_base, u32 _bridge_timer1_clr_mask, | |||
194 | /* | 194 | /* |
195 | * Set SoC-specific data. | 195 | * Set SoC-specific data. |
196 | */ | 196 | */ |
197 | bridge_base = (void __iomem *)_bridge_base; | 197 | bridge_base = _bridge_base; |
198 | bridge_timer1_clr_mask = _bridge_timer1_clr_mask; | 198 | bridge_timer1_clr_mask = _bridge_timer1_clr_mask; |
199 | 199 | ||
200 | ticks_per_jiffy = (tclk + HZ/2) / HZ; | 200 | ticks_per_jiffy = (tclk + HZ/2) / HZ; |