ASoC: Convert afeb9260 to table based DAPM init
authorAxel Lin <axel.lin@gmail.com>
Sun, 29 Jan 2012 08:52:51 +0000 (16:52 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 1 Feb 2012 21:52:54 +0000 (21:52 +0000)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/atmel/snd-soc-afeb9260.c

index cb0130cf8f1339ff556d1fd7bc5f8b6a071ad3b0..f65f08beac31487248139e594f16d5f51381e08b 100644 (file)
@@ -70,7 +70,7 @@ static const struct snd_soc_dapm_widget tlv320aic23_dapm_widgets[] = {
        SND_SOC_DAPM_MIC("Mic Jack", NULL),
 };
 
-static const struct snd_soc_dapm_route audio_map[] = {
+static const struct snd_soc_dapm_route afeb9260_audio_map[] = {
        {"Headphone Jack", NULL, "LHPOUT"},
        {"Headphone Jack", NULL, "RHPOUT"},
 
@@ -85,13 +85,6 @@ static int afeb9260_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_codec *codec = rtd->codec;
        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-       /* Add afeb9260 specific widgets */
-       snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets,
-                                 ARRAY_SIZE(tlv320aic23_dapm_widgets));
-
-       /* Set up afeb9260 specific audio path audio_map */
-       snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
        snd_soc_dapm_enable_pin(dapm, "Line In");
        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
@@ -119,6 +112,11 @@ static struct snd_soc_card snd_soc_machine_afeb9260 = {
        .owner = THIS_MODULE,
        .dai_link = &afeb9260_dai,
        .num_links = 1,
+
+       .dapm_widgets = tlv320aic23_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets),
+       .dapm_routes = afeb9260_audio_map,
+       .num_dapm_routes = ARRAY_SIZE(afeb9260_audio_map),
 };
 
 static struct platform_device *afeb9260_snd_device;