aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/fsi.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-02 16:28:02 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-02 16:51:27 -0400
commitca7aceef21f2689d0b0e92aa4f316959f7931c25 (patch)
tree9bd82dc062a867382fac2f0f08553e3e04465ae3 /sound/soc/sh/fsi.c
parentb381bc8ab8bb22ed1581033094c2c0af1a034fcc (diff)
ASoC: sh: use correct __iomem annotations
This removes a few unnecessary type casts and avoids sparse warnings. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/sh/fsi.c')
-rw-r--r--sound/soc/sh/fsi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 8e112ccffb13..916b9f99b7e7 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -210,7 +210,7 @@ struct fsi_master {
210 * basic read write function 210 * basic read write function
211 */ 211 */
212 212
213static void __fsi_reg_write(u32 reg, u32 data) 213static void __fsi_reg_write(u32 __iomem *reg, u32 data)
214{ 214{
215 /* valid data area is 24bit */ 215 /* valid data area is 24bit */
216 data &= 0x00ffffff; 216 data &= 0x00ffffff;
@@ -218,12 +218,12 @@ static void __fsi_reg_write(u32 reg, u32 data)
218 __raw_writel(data, reg); 218 __raw_writel(data, reg);
219} 219}
220 220
221static u32 __fsi_reg_read(u32 reg) 221static u32 __fsi_reg_read(u32 __iomem *reg)
222{ 222{
223 return __raw_readl(reg); 223 return __raw_readl(reg);
224} 224}
225 225
226static void __fsi_reg_mask_set(u32 reg, u32 mask, u32 data) 226static void __fsi_reg_mask_set(u32 __iomem *reg, u32 mask, u32 data)
227{ 227{
228 u32 val = __fsi_reg_read(reg); 228 u32 val = __fsi_reg_read(reg);
229 229
@@ -250,7 +250,7 @@ static u32 _fsi_master_read(struct fsi_master *master, u32 reg)
250 unsigned long flags; 250 unsigned long flags;
251 251
252 spin_lock_irqsave(&master->lock, flags); 252 spin_lock_irqsave(&master->lock, flags);
253 ret = __fsi_reg_read((u32)(master->base + reg)); 253 ret = __fsi_reg_read(master->base + reg);
254 spin_unlock_irqrestore(&master->lock, flags); 254 spin_unlock_irqrestore(&master->lock, flags);
255 255
256 return ret; 256 return ret;
@@ -264,7 +264,7 @@ static void _fsi_master_mask_set(struct fsi_master *master,
264 unsigned long flags; 264 unsigned long flags;
265 265
266 spin_lock_irqsave(&master->lock, flags); 266 spin_lock_irqsave(&master->lock, flags);
267 __fsi_reg_mask_set((u32)(master->base + reg), mask, data); 267 __fsi_reg_mask_set(master->base + reg, mask, data);
268 spin_unlock_irqrestore(&master->lock, flags); 268 spin_unlock_irqrestore(&master->lock, flags);
269} 269}
270 270