[PATCH 2/3] ASoC: tlv320aic3x: Convert codec->hw_read toregmap_read

From: Axel Lin
Date: Thu Oct 13 2011 - 03:24:28 EST


codec->hw_read is broken now, let's covert to regmap_read.

Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
---
sound/soc/codecs/tlv320aic3x.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index be55b7f..8775d52 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -131,13 +131,19 @@ static int aic3x_read(struct snd_soc_codec *codec, unsigned int reg,
u8 *value)
{
u8 *cache = codec->reg_cache;
+ unsigned int val;
+ int ret;

if (codec->cache_only)
return -EINVAL;
if (reg >= AIC3X_CACHEREGNUM)
return -1;

- *value = codec->hw_read(codec, reg);
+ ret = regmap_read(codec->control_data, reg, &val);
+ if (ret)
+ return ret;
+
+ *value = val;
cache[reg] = *value;

return 0;
--
1.7.4.1



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/