Skip to content

Commit

Permalink
ASoC: sh: use correct __iomem annotations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann authored and Mark Brown committed Oct 2, 2011
1 parent b381bc8 commit ca7acee
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions sound/soc/sh/fsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,20 +210,20 @@ 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;

__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);

Expand All @@ -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;
Expand All @@ -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);
}

Expand Down

0 comments on commit ca7acee

Please sign in to comment.