fix-deprecated-soc-api.eml

diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
index 911c1de..dba635e 100644 (file)
--- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
@@ -435,7 +435,7 @@ static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = {
 
 
 /* example machine audio_mapnections */
-static const char* audio_map[][3] = {
+static const struct snd_soc_dapm_route audio_map[] = {
 
        /* Connections to the lm4853 amp */
        {"Stereo Out", NULL, "LOUT1"},
@@ -462,8 +462,6 @@ static const char* audio_map[][3] = {
 
        /* Connect the ALC pins */
        {"ACIN", NULL, "ACOP"},
-
-       {NULL, NULL, NULL},
 };
 
 static const struct snd_kcontrol_new wm8753_neo1973_gta02_controls[] = {
@@ -507,9 +505,13 @@ static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
        snd_soc_dapm_set_endpoint(codec, "LINE1", 0);
        snd_soc_dapm_set_endpoint(codec, "LINE2", 0);
 
+
        /* Add neo1973 gta02 specific widgets */
+       snd_soc_dapm_new_controls(codec, wm8753_dapm_widgets, ARRAY_SIZE(wm8753_dapm_widgets));
+#if 0
        for (i = 0; i < ARRAY_SIZE(wm8753_dapm_widgets); i++)
                snd_soc_dapm_new_control(codec, &wm8753_dapm_widgets[i]);
+#endif
 
        /* add neo1973 gta02 specific controls */
        for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_gta02_controls); i++) {
@@ -521,10 +523,13 @@ static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
        }
 
        /* set up neo1973 gta02 specific audio path audio_mapnects */
+#if 0
        for (i = 0; audio_map[i][0] != NULL; i++) {
                snd_soc_dapm_connect_input(codec, audio_map[i][0],
                        audio_map[i][1], audio_map[i][2]);
        }
+#endif
+       snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
        /* set endpoints to default off mode */
        snd_soc_dapm_set_endpoint(codec, "Stereo Out",  0);