| Message ID | 1393090325-10712-2-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d7f31d3c898e3e621a34d5d64966f7b830df66f1 |
| Headers | show |
On Sat, Feb 22, 2014 at 06:32:05PM +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 wm8962 driver for this by using > wm8962->regmap instead of accessing the CODEC's control_data field. Applied, thanks.
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 3be4633..b6086d2 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1479,7 +1479,9 @@ static const DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); static int wm8962_dsp2_write_config(struct snd_soc_codec *codec) { - return regcache_sync_region(codec->control_data, + struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); + + return regcache_sync_region(wm8962->regmap, WM8962_HDBASS_AI_1, WM8962_MAX_REGISTER); }
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 wm8962 driver for this by using wm8962->regmap instead of accessing the CODEC's control_data field. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- sound/soc/codecs/wm8962.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)