forked from Minki/linux
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>
This commit is contained in:
parent
b381bc8ab8
commit
ca7aceef21
@ -210,7 +210,7 @@ struct fsi_master {
|
||||
* 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 */
|
||||
data &= 0x00ffffff;
|
||||
@ -218,12 +218,12 @@ static void __fsi_reg_write(u32 reg, u32 data)
|
||||
__raw_writel(data, reg);
|
||||
}
|
||||
|
||||
static u32 __fsi_reg_read(u32 reg)
|
||||
static u32 __fsi_reg_read(u32 __iomem *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);
|
||||
|
||||
@ -250,7 +250,7 @@ static u32 _fsi_master_read(struct fsi_master *master, u32 reg)
|
||||
unsigned long 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);
|
||||
|
||||
return ret;
|
||||
@ -264,7 +264,7 @@ static void _fsi_master_mask_set(struct fsi_master *master,
|
||||
unsigned long 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);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user