diff options
author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2009-05-29 02:22:37 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-29 06:02:48 -0400 |
commit | 16a30fbb0d3aa4ee829a2dd3d0e314e2b5ae96a9 (patch) | |
tree | 68a444cf8a4cc09e4b2b06909f6e8826ca21a6f4 /sound/soc | |
parent | 203350c1a8e23adf17fd9a96d8bfc7adf63c1ff6 (diff) |
ASoC: TWL4030: Use reg_cache in twl4030_init_chip
Use the codec->reg_cache instead of the array directly
in twl4030_init_chip for setting the default values.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/twl4030.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 63ebd176fbe4..df474a5dd357 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -145,7 +145,6 @@ struct twl4030_priv { | |||
145 | static inline unsigned int twl4030_read_reg_cache(struct snd_soc_codec *codec, | 145 | static inline unsigned int twl4030_read_reg_cache(struct snd_soc_codec *codec, |
146 | unsigned int reg) | 146 | unsigned int reg) |
147 | { | 147 | { |
148 | u8 *cache = codec->reg_cache; | ||
149 | 148 | ||
150 | if (reg >= TWL4030_CACHEREGNUM) | 149 | if (reg >= TWL4030_CACHEREGNUM) |
151 | return -EIO; | 150 | return -EIO; |
@@ -204,6 +203,7 @@ static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable) | |||
204 | 203 | ||
205 | static void twl4030_init_chip(struct snd_soc_codec *codec) | 204 | static void twl4030_init_chip(struct snd_soc_codec *codec) |
206 | { | 205 | { |
206 | u8 *cache = codec->reg_cache; | ||
207 | int i; | 207 | int i; |
208 | 208 | ||
209 | /* clear CODECPDZ prior to setting register defaults */ | 209 | /* clear CODECPDZ prior to setting register defaults */ |
@@ -211,7 +211,7 @@ static void twl4030_init_chip(struct snd_soc_codec *codec) | |||
211 | 211 | ||
212 | /* set all audio section registers to reasonable defaults */ | 212 | /* set all audio section registers to reasonable defaults */ |
213 | for (i = TWL4030_REG_OPTION; i <= TWL4030_REG_MISC_SET_2; i++) | 213 | for (i = TWL4030_REG_OPTION; i <= TWL4030_REG_MISC_SET_2; i++) |
214 | twl4030_write(codec, i, twl4030_reg[i]); | 214 | twl4030_write(codec, i, cache[i]); |
215 | 215 | ||
216 | } | 216 | } |
217 | 217 | ||