diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-05-04 18:46:09 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-04 18:30:57 +0100 |
| commit | 33c7b140935a93a97cd09a401932c94fae93968b (patch) | |
| tree | 76259af13706bc955cdf2528218d26013603b34c /sound/soc/codecs/adau1781.c | |
| parent | b787f68c36d49bb1d9236f403813641efa74a031 (diff) | |
| download | blackbird-obmc-linux-33c7b140935a93a97cd09a401932c94fae93968b.tar.gz blackbird-obmc-linux-33c7b140935a93a97cd09a401932c94fae93968b.zip | |
ASoC: adau17x1: Replace direct snd_soc_codec dapm field access
The dapm field of the snd_soc_codec struct is eventually going to be
removed, in preparation for this replace all manual access to
codec->dapm with snd_soc_codec_get_dapm().
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/adau1781.c')
| -rw-r--r-- | sound/soc/codecs/adau1781.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/codecs/adau1781.c b/sound/soc/codecs/adau1781.c index 35581f43fa6d..4c8ec2764b14 100644 --- a/sound/soc/codecs/adau1781.c +++ b/sound/soc/codecs/adau1781.c @@ -383,6 +383,7 @@ static int adau1781_set_input_mode(struct adau *adau, unsigned int reg, static int adau1781_codec_probe(struct snd_soc_codec *codec) { + struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct adau1781_platform_data *pdata = dev_get_platdata(codec->dev); struct adau *adau = snd_soc_codec_get_drvdata(codec); int ret; @@ -403,19 +404,17 @@ static int adau1781_codec_probe(struct snd_soc_codec *codec) } if (pdata && pdata->use_dmic) { - ret = snd_soc_dapm_new_controls(&codec->dapm, + ret = snd_soc_dapm_new_controls(dapm, adau1781_dmic_dapm_widgets, ARRAY_SIZE(adau1781_dmic_dapm_widgets)); if (ret) return ret; - ret = snd_soc_dapm_add_routes(&codec->dapm, - adau1781_dmic_dapm_routes, + ret = snd_soc_dapm_add_routes(dapm, adau1781_dmic_dapm_routes, ARRAY_SIZE(adau1781_dmic_dapm_routes)); if (ret) return ret; } else { - ret = snd_soc_dapm_add_routes(&codec->dapm, - adau1781_adc_dapm_routes, + ret = snd_soc_dapm_add_routes(dapm, adau1781_adc_dapm_routes, ARRAY_SIZE(adau1781_adc_dapm_routes)); if (ret) return ret; |
