Commit ca7aceef authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown

ASoC: sh: use correct __iomem annotations

This removes a few unnecessary type casts and avoids
sparse warnings.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b381bc8a
...@@ -210,7 +210,7 @@ struct fsi_master { ...@@ -210,7 +210,7 @@ struct fsi_master {
* basic read write function * basic read write function
*/ */
static void __fsi_reg_write(u32 reg, u32 data) static void __fsi_reg_write(u32 __iomem *reg, u32 data)
{ {
/* valid data area is 24bit */ /* valid data area is 24bit */
data &= 0x00ffffff; data &= 0x00ffffff;
...@@ -218,12 +218,12 @@ static void __fsi_reg_write(u32 reg, u32 data) ...@@ -218,12 +218,12 @@ static void __fsi_reg_write(u32 reg, u32 data)
__raw_writel(data, reg); __raw_writel(data, reg);
} }
static u32 __fsi_reg_read(u32 reg) static u32 __fsi_reg_read(u32 __iomem *reg)
{ {
return __raw_readl(reg); return __raw_readl(reg);
} }
static void __fsi_reg_mask_set(u32 reg, u32 mask, u32 data) static void __fsi_reg_mask_set(u32 __iomem *reg, u32 mask, u32 data)
{ {
u32 val = __fsi_reg_read(reg); u32 val = __fsi_reg_read(reg);
...@@ -250,7 +250,7 @@ static u32 _fsi_master_read(struct fsi_master *master, u32 reg) ...@@ -250,7 +250,7 @@ static u32 _fsi_master_read(struct fsi_master *master, u32 reg)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&master->lock, flags); spin_lock_irqsave(&master->lock, flags);
ret = __fsi_reg_read((u32)(master->base + reg)); ret = __fsi_reg_read(master->base + reg);
spin_unlock_irqrestore(&master->lock, flags); spin_unlock_irqrestore(&master->lock, flags);
return ret; return ret;
...@@ -264,7 +264,7 @@ static void _fsi_master_mask_set(struct fsi_master *master, ...@@ -264,7 +264,7 @@ static void _fsi_master_mask_set(struct fsi_master *master,
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&master->lock, flags); spin_lock_irqsave(&master->lock, flags);
__fsi_reg_mask_set((u32)(master->base + reg), mask, data); __fsi_reg_mask_set(master->base + reg, mask, data);
spin_unlock_irqrestore(&master->lock, flags); spin_unlock_irqrestore(&master->lock, flags);
} }
......
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