ASoC: TrimSlice machine: Set the new fully_routed flag
authorStephen Warren <swarren@nvidia.com>
Wed, 23 Nov 2011 19:42:06 +0000 (12:42 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 23 Nov 2011 21:35:03 +0000 (21:35 +0000)
Set card.fully_routed to request the ASoC core calculated unused codec
pins, and call snd_soc_dapm_nc_pin() for them. Remove the open-coded
calls.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/tegra/trimslice.c

index d564b40756a94f111000758bb0b6f8e489523637..043eb7c7eb73303e36ae889616f65ad2c054d209 100644 (file)
@@ -119,7 +119,6 @@ static int trimslice_asoc_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_codec *codec = rtd->codec;
        struct snd_soc_card *card = codec->card;
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
        int ret;
 
        ret = tegra_das_connect_dap_to_dac(TEGRA_DAS_DAP_ID_1,
@@ -135,10 +134,6 @@ static int trimslice_asoc_init(struct snd_soc_pcm_runtime *rtd)
                return ret;
        }
 
-       snd_soc_dapm_nc_pin(dapm, "LHPOUT");
-       snd_soc_dapm_nc_pin(dapm, "RHPOUT");
-       snd_soc_dapm_nc_pin(dapm, "MICIN");
-
        return 0;
 }
 
@@ -162,6 +157,7 @@ static struct snd_soc_card snd_soc_trimslice = {
        .num_dapm_widgets = ARRAY_SIZE(trimslice_dapm_widgets),
        .dapm_routes = trimslice_audio_map,
        .num_dapm_routes = ARRAY_SIZE(trimslice_audio_map),
+       .fully_routed = true,
 };
 
 static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)