Merge tag 'pm+acpi-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[firefly-linux-kernel-4.4.55.git] / sound / soc / pxa / tosa.c

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index cead1658d10a497c14bc84ede0f2888c6a950f6e..4a956d1cb26960a23bb77eea839908d608b56677 100644 (file)
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -44,9 +44,8 @@
 static int tosa_jack_func;
 static int tosa_spk_func;
 
-static void tosa_ext_control(struct snd_soc_codec *codec)
+static void tosa_ext_control(struct snd_soc_dapm_context *dapm)
 {
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
 
        snd_soc_dapm_mutex_lock(dapm);
 
@@ -82,10 +81,9 @@ static void tosa_ext_control(struct snd_soc_codec *codec)
 static int tosa_startup(struct snd_pcm_substream *substream)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_codec *codec = rtd->codec;
 
        /* check the jack status at stream startup */
-       tosa_ext_control(codec);
+       tosa_ext_control(&rtd->card->dapm);
 
        return 0;
 }
@@ -104,13 +102,13 @@ static int tosa_get_jack(struct snd_kcontrol *kcontrol,
 static int tosa_set_jack(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+       struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
 
        if (tosa_jack_func == ucontrol->value.integer.value[0])
                return 0;
 
        tosa_jack_func = ucontrol->value.integer.value[0];
-       tosa_ext_control(codec);
+       tosa_ext_control(&card->dapm);
        return 1;
 }
 
@@ -124,13 +122,13 @@ static int tosa_get_spk(struct snd_kcontrol *kcontrol,
 static int tosa_set_spk(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+       struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
 
        if (tosa_spk_func == ucontrol->value.integer.value[0])
                return 0;
 
        tosa_spk_func = ucontrol->value.integer.value[0];
-       tosa_ext_control(codec);
+       tosa_ext_control(&card->dapm);
        return 1;
 }
 
@@ -191,24 +189,10 @@ static int tosa_ac97_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_codec *codec = rtd->codec;
        struct snd_soc_dapm_context *dapm = &codec->dapm;
-       int err;
 
        snd_soc_dapm_nc_pin(dapm, "OUT3");
        snd_soc_dapm_nc_pin(dapm, "MONOOUT");
 
-       /* add tosa specific controls */
-       err = snd_soc_add_codec_controls(codec, tosa_controls,
-                               ARRAY_SIZE(tosa_controls));
-       if (err < 0)
-               return err;
-
-       /* add tosa specific widgets */
-       snd_soc_dapm_new_controls(dapm, tosa_dapm_widgets,
-                                 ARRAY_SIZE(tosa_dapm_widgets));
-
-       /* set up tosa specific audio path audio_map */
-       snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
        return 0;
 }
 
@@ -239,6 +223,13 @@ static struct snd_soc_card tosa = {
        .owner = THIS_MODULE,
        .dai_link = tosa_dai,
        .num_links = ARRAY_SIZE(tosa_dai),
+
+       .controls = tosa_controls,
+       .num_controls = ARRAY_SIZE(tosa_controls),
+       .dapm_widgets = tosa_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(tosa_dapm_widgets),
+       .dapm_routes = audio_map,
+       .num_dapm_routes = ARRAY_SIZE(audio_map),
 };
 
 static int tosa_probe(struct platform_device *pdev)