| Message ID | 1393090485-10894-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 30812cca63600a3e4b44b93ed2ec7e00ce572ee0 |
| Headers | show |
On Sat, 22 Feb 2014 17:35:01 +0000, Lars-Peter Clausen wrote: > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
On Sat, Feb 22, 2014 at 06:34:45PM +0100, Lars-Peter Clausen wrote: > 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. Applied, thanks.
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index f295b65..54db45d 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -1487,8 +1487,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, @@ -1499,7 +1499,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);
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> --- sound/soc/codecs/da732x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)