OSDN Git Service

ASoC: uda134x: Replace direct snd_soc_codec dapm field access
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 11 May 2015 07:42:33 +0000 (09:42 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 11 May 2015 16:33:31 +0000 (17:33 +0100)
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>
sound/soc/codecs/uda134x.c

index dbecbc0..913edf2 100644 (file)
@@ -477,6 +477,7 @@ static struct snd_soc_dai_driver uda134x_dai = {
 
 static int uda134x_soc_probe(struct snd_soc_codec *codec)
 {
+       struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct uda134x_priv *uda134x;
        struct uda134x_platform_data *pd = codec->component.card->dev->platform_data;
        const struct snd_soc_dapm_widget *widgets;
@@ -525,7 +526,7 @@ static int uda134x_soc_probe(struct snd_soc_codec *codec)
                num_widgets = ARRAY_SIZE(uda1340_dapm_widgets);
        }
 
-       ret = snd_soc_dapm_new_controls(&codec->dapm, widgets, num_widgets);
+       ret = snd_soc_dapm_new_controls(dapm, widgets, num_widgets);
        if (ret) {
                printk(KERN_ERR "%s failed to register dapm controls: %d",
                        __func__, ret);