ASoC: max98095: Convert codec->hw_write to snd_soc_write
authorAxel Lin <axel.lin@gmail.com>
Sat, 15 Oct 2011 03:46:02 +0000 (11:46 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 22 Oct 2011 10:09:54 +0000 (11:09 +0100)
codec->hw_write is broken now, convert codec->hw_write to snd_soc_write.

The hardware has 2 banks of registers sharing a section in I2C register space.
The 1st bank is the primary one and is cached.
The 2nd bank is for loading coefficients only and they do not need cache.
These coefficients registers are therefore direct writes.
Thus we set cache_bypass flag to deal with this before calling snd_soc_write.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/max98095.c

index 6982f743c8917afd759e64327e4f101d77efd3d3..26d7b089fb9c27836c2a6721dceec1350bc5300f 100644 (file)
@@ -617,14 +617,13 @@ static int max98095_volatile(struct snd_soc_codec *codec, unsigned int reg)
 static int max98095_hw_write(struct snd_soc_codec *codec, unsigned int reg,
                             unsigned int value)
 {
-       u8 data[2];
+       int ret;
 
-       data[0] = reg;
-       data[1] = value;
-       if (codec->hw_write(codec->control_data, data, 2) == 2)
-               return 0;
-       else
-               return -EIO;
+       codec->cache_bypass = 1;
+       ret = snd_soc_write(codec, reg, value);
+       codec->cache_bypass = 0;
+
+       return ret ? -EIO : 0;
 }
 
 /*