ASoC: fix compilation breakage in sound/soc/sh/fsi.c
ctrl_outl() has become void at some point, which breaks compilation of fsi.c. Make writing functions void, as their output is anyway not evaluated, and use __raw_writel and __raw_readl instead of deprecated ctrl_outl and ctrl_inl respectively. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
026384d614
commit
0f69d9782c
|
@ -120,35 +120,35 @@ struct fsi_master {
|
||||||
|
|
||||||
|
|
||||||
************************************************************************/
|
************************************************************************/
|
||||||
static int __fsi_reg_write(u32 reg, u32 data)
|
static void __fsi_reg_write(u32 reg, u32 data)
|
||||||
{
|
{
|
||||||
/* valid data area is 24bit */
|
/* valid data area is 24bit */
|
||||||
data &= 0x00ffffff;
|
data &= 0x00ffffff;
|
||||||
|
|
||||||
return ctrl_outl(data, reg);
|
__raw_writel(data, reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 __fsi_reg_read(u32 reg)
|
static u32 __fsi_reg_read(u32 reg)
|
||||||
{
|
{
|
||||||
return ctrl_inl(reg);
|
return __raw_readl(reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __fsi_reg_mask_set(u32 reg, u32 mask, u32 data)
|
static void __fsi_reg_mask_set(u32 reg, u32 mask, u32 data)
|
||||||
{
|
{
|
||||||
u32 val = __fsi_reg_read(reg);
|
u32 val = __fsi_reg_read(reg);
|
||||||
|
|
||||||
val &= ~mask;
|
val &= ~mask;
|
||||||
val |= data & mask;
|
val |= data & mask;
|
||||||
|
|
||||||
return __fsi_reg_write(reg, val);
|
__fsi_reg_write(reg, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fsi_reg_write(struct fsi_priv *fsi, u32 reg, u32 data)
|
static void fsi_reg_write(struct fsi_priv *fsi, u32 reg, u32 data)
|
||||||
{
|
{
|
||||||
if (reg > REG_END)
|
if (reg > REG_END)
|
||||||
return -1;
|
return;
|
||||||
|
|
||||||
return __fsi_reg_write((u32)(fsi->base + reg), data);
|
__fsi_reg_write((u32)(fsi->base + reg), data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 fsi_reg_read(struct fsi_priv *fsi, u32 reg)
|
static u32 fsi_reg_read(struct fsi_priv *fsi, u32 reg)
|
||||||
|
@ -159,28 +159,25 @@ static u32 fsi_reg_read(struct fsi_priv *fsi, u32 reg)
|
||||||
return __fsi_reg_read((u32)(fsi->base + reg));
|
return __fsi_reg_read((u32)(fsi->base + reg));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fsi_reg_mask_set(struct fsi_priv *fsi, u32 reg, u32 mask, u32 data)
|
static void fsi_reg_mask_set(struct fsi_priv *fsi, u32 reg, u32 mask, u32 data)
|
||||||
{
|
{
|
||||||
if (reg > REG_END)
|
if (reg > REG_END)
|
||||||
return -1;
|
return;
|
||||||
|
|
||||||
return __fsi_reg_mask_set((u32)(fsi->base + reg), mask, data);
|
__fsi_reg_mask_set((u32)(fsi->base + reg), mask, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fsi_master_write(struct fsi_master *master, u32 reg, u32 data)
|
static void fsi_master_write(struct fsi_master *master, u32 reg, u32 data)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
if ((reg < MREG_START) ||
|
if ((reg < MREG_START) ||
|
||||||
(reg > MREG_END))
|
(reg > MREG_END))
|
||||||
return -1;
|
return;
|
||||||
|
|
||||||
spin_lock_irqsave(&master->lock, flags);
|
spin_lock_irqsave(&master->lock, flags);
|
||||||
ret = __fsi_reg_write((u32)(master->base + reg), data);
|
__fsi_reg_write((u32)(master->base + reg), data);
|
||||||
spin_unlock_irqrestore(&master->lock, flags);
|
spin_unlock_irqrestore(&master->lock, flags);
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static u32 fsi_master_read(struct fsi_master *master, u32 reg)
|
static u32 fsi_master_read(struct fsi_master *master, u32 reg)
|
||||||
|
@ -199,21 +196,18 @@ static u32 fsi_master_read(struct fsi_master *master, u32 reg)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fsi_master_mask_set(struct fsi_master *master,
|
static void fsi_master_mask_set(struct fsi_master *master,
|
||||||
u32 reg, u32 mask, u32 data)
|
u32 reg, u32 mask, u32 data)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
if ((reg < MREG_START) ||
|
if ((reg < MREG_START) ||
|
||||||
(reg > MREG_END))
|
(reg > MREG_END))
|
||||||
return -1;
|
return;
|
||||||
|
|
||||||
spin_lock_irqsave(&master->lock, flags);
|
spin_lock_irqsave(&master->lock, flags);
|
||||||
ret = __fsi_reg_mask_set((u32)(master->base + reg), mask, data);
|
__fsi_reg_mask_set((u32)(master->base + reg), mask, data);
|
||||||
spin_unlock_irqrestore(&master->lock, flags);
|
spin_unlock_irqrestore(&master->lock, flags);
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
|
|
Loading…
Reference in a new issue