Skip to content

Commit

Permalink
ASoC: fsi: Add pr_err for noticing unsupported access
Browse files Browse the repository at this point in the history
This patch didn't use dev_err,
because it is difficult to get struct device here.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Jul 13, 2010
1 parent 73b92c1 commit d785414
Showing 1 changed file with 18 additions and 6 deletions.
24 changes: 18 additions & 6 deletions sound/soc/sh/fsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,24 +161,30 @@ static void __fsi_reg_mask_set(u32 reg, u32 mask, u32 data)

static void fsi_reg_write(struct fsi_priv *fsi, u32 reg, u32 data)
{
if (reg > REG_END)
if (reg > REG_END) {
pr_err("fsi: register access err (%s)\n", __func__);
return;
}

__fsi_reg_write((u32)(fsi->base + reg), data);
}

static u32 fsi_reg_read(struct fsi_priv *fsi, u32 reg)
{
if (reg > REG_END)
if (reg > REG_END) {
pr_err("fsi: register access err (%s)\n", __func__);
return 0;
}

return __fsi_reg_read((u32)(fsi->base + reg));
}

static void fsi_reg_mask_set(struct fsi_priv *fsi, u32 reg, u32 mask, u32 data)
{
if (reg > REG_END)
if (reg > REG_END) {
pr_err("fsi: register access err (%s)\n", __func__);
return;
}

__fsi_reg_mask_set((u32)(fsi->base + reg), mask, data);
}
Expand All @@ -188,8 +194,10 @@ static void fsi_master_write(struct fsi_master *master, u32 reg, u32 data)
unsigned long flags;

if ((reg < MREG_START) ||
(reg > MREG_END))
(reg > MREG_END)) {
pr_err("fsi: register access err (%s)\n", __func__);
return;
}

spin_lock_irqsave(&master->lock, flags);
__fsi_reg_write((u32)(master->base + reg), data);
Expand All @@ -202,8 +210,10 @@ static u32 fsi_master_read(struct fsi_master *master, u32 reg)
unsigned long flags;

if ((reg < MREG_START) ||
(reg > MREG_END))
(reg > MREG_END)) {
pr_err("fsi: register access err (%s)\n", __func__);
return 0;
}

spin_lock_irqsave(&master->lock, flags);
ret = __fsi_reg_read((u32)(master->base + reg));
Expand All @@ -218,8 +228,10 @@ static void fsi_master_mask_set(struct fsi_master *master,
unsigned long flags;

if ((reg < MREG_START) ||
(reg > MREG_END))
(reg > MREG_END)) {
pr_err("fsi: register access err (%s)\n", __func__);
return;
}

spin_lock_irqsave(&master->lock, flags);
__fsi_reg_mask_set((u32)(master->base + reg), mask, data);
Expand Down

0 comments on commit d785414

Please sign in to comment.