leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: fsi: Add pr_err for noticing unsupported access

Browse Source 
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>
This commit is contained in:
Kuninori Morimoto 2010-07-13 12:13:09 +09:00 committed by Mark Brown
parent 73b92c1fc0
commit d78541473d
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sound/soc/sh/fsi.c
View File

@ -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) 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; 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)
{ {
if (reg > REG_END) if (reg > REG_END) {
pr_err("fsi: register access err (%s)\n", __func__);
return 0; return 0;
}
return __fsi_reg_read((u32)(fsi->base + reg)); return __fsi_reg_read((u32)(fsi->base + reg));
} }
static void 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) {
pr_err("fsi: register access err (%s)\n", __func__);
return; return;
}
__fsi_reg_mask_set((u32)(fsi->base + reg), mask, data); __fsi_reg_mask_set((u32)(fsi->base + reg), mask, data);
} }
@ -188,8 +194,10 @@ static void fsi_master_write(struct fsi_master *master, u32 reg, u32 data)
unsigned long flags; unsigned long flags;
if ((reg < MREG_START) || if ((reg < MREG_START) ||
(reg > MREG_END)) (reg > MREG_END)) {
pr_err("fsi: register access err (%s)\n", __func__);
return; return;
}
spin_lock_irqsave(&master->lock, flags); spin_lock_irqsave(&master->lock, flags);
__fsi_reg_write((u32)(master->base + reg), data); __fsi_reg_write((u32)(master->base + reg), data);
@ -202,8 +210,10 @@ static u32 fsi_master_read(struct fsi_master *master, u32 reg)
unsigned long flags; unsigned long flags;
if ((reg < MREG_START) || if ((reg < MREG_START) ||
(reg > MREG_END)) (reg > MREG_END)) {
pr_err("fsi: register access err (%s)\n", __func__);
return 0; return 0;
}
spin_lock_irqsave(&master->lock, flags); spin_lock_irqsave(&master->lock, flags);
ret = __fsi_reg_read((u32)(master->base + reg)); ret = __fsi_reg_read((u32)(master->base + reg));
@ -218,8 +228,10 @@ static void fsi_master_mask_set(struct fsi_master *master,
unsigned long flags; unsigned long flags;
if ((reg < MREG_START) || if ((reg < MREG_START) ||
(reg > MREG_END)) (reg > MREG_END)) {
pr_err("fsi: register access err (%s)\n", __func__);
return; return;
}
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((u32)(master->base + reg), mask, data);