diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-02-22 18:34:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-25 13:34:08 +0900 |
| commit | 30812cca63600a3e4b44b93ed2ec7e00ce572ee0 (patch) | |
| tree | 370c87db99f03acf42a9567ffeed66bf09b563ba /sound/soc/codecs/da732x.c | |
| parent | eeecf1a3f9f4791371bf35035ab9b95ab6aab5e7 (diff) | |
| download | linux-30812cca63600a3e4b44b93ed2ec7e00ce572ee0.tar.bz2 | |
ASoC: da732x: Use da732x->regmap instead of codec->control_data
With the ongoing component-ization of the ASoC framework and the continuing
migration to using regmap for IO the control_data field of the snd_soc_codec
struct will eventually be removed. Prepare the da732x driver for this by using
da732x->regmap instead of accessing the CODEC's control_data field.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/da732x.c')
| -rw-r--r-- | sound/soc/codecs/da732x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 05f07fb49860..cf9b15472c85 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -1471,8 +1471,8 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, da732x_hp_dc_offset_cancellation(codec); - regcache_cache_only(codec->control_data, false); - regcache_sync(codec->control_data); + regcache_cache_only(da732x->regmap, false); + regcache_sync(da732x->regmap); } else { snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, DA732X_BIAS_BOOST_MASK, @@ -1483,7 +1483,7 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec, } break; case SND_SOC_BIAS_OFF: - regcache_cache_only(codec->control_data, true); + regcache_cache_only(da732x->regmap, true); da732x_set_charge_pump(codec, DA732X_DISABLE_CP); snd_soc_update_bits(codec, DA732X_REG_BIAS_EN, DA732X_BIAS_EN, DA732X_BIAS_DIS); |