ASoC: Remove redundant snd_soc_dapm_new_widgets() calls

The DAPM widgets are now insntantiated by the core when creating the card
so there is no need for the individual CODEC drivers to do so.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index b4be96d..2c18e3d 100644 (file)
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -385,7 +385,6 @@ static int ad1836_probe(struct platform_device *pdev)
        snd_soc_dapm_new_controls(codec, ad1836_dapm_widgets,
                                  ARRAY_SIZE(ad1836_dapm_widgets));
        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
-       snd_soc_dapm_new_widgets(codec);
 
 pcm_err:
        return ret;

diff --git a/sound/soc/codecs/ad1938.c b/sound/soc/codecs/ad1938.c
index 3b2222a..5d48918 100644 (file)
--- a/sound/soc/codecs/ad1938.c
+++ b/sound/soc/codecs/ad1938.c
@@ -592,7 +592,6 @@ static int ad1938_probe(struct platform_device *pdev)
        snd_soc_dapm_new_controls(codec, ad1938_dapm_widgets,
                                  ARRAY_SIZE(ad1938_dapm_widgets));
        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
-       snd_soc_dapm_new_widgets(codec);
 
        ad1938_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 

diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index 57a6846..ff96656 100644 (file)
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -294,7 +294,6 @@ static int ak4535_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index 364832c..82fca28 100644 (file)
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -441,7 +441,6 @@ static int ak4671_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index dda751c..e000cdf 100644 (file)
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -93,7 +93,6 @@ static int cx20442_add_widgets(struct snd_soc_codec *codec)
        snd_soc_dapm_add_routes(codec, cx20442_audio_map,
                                ARRAY_SIZE(cx20442_audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index b313033..d2ff1cd 100644 (file)
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -210,7 +210,6 @@ static int ssm2602_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_conn, ARRAY_SIZE(audio_conn));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index ee8cb2c..1709e3f 100644 (file)
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -395,7 +395,6 @@ static int tlv320aic23_add_widgets(struct snd_soc_codec *codec)
        /* set up audio path interconnects */
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 03cad25..2b4dc2b 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -753,7 +753,6 @@ static int aic3x_add_widgets(struct snd_soc_codec *codec)
        /* set up audio path interconnects */
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index bff476d..2a013e4 100644 (file)
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -462,7 +462,6 @@ static int dac33_add_widgets(struct snd_soc_codec *codec)
 
        /* set up audio path interconnects */
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
-       snd_soc_dapm_new_widgets(codec);
 
        return 0;
 }

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 510b8b2..5f1681f 100644 (file)
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -1493,7 +1493,6 @@ static int twl4030_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index a42e47d..a2763c2 100644 (file)
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -378,7 +378,6 @@ static int uda1380_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 2e35a35..f82125d 100644 (file)
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -800,7 +800,7 @@ static int wm8350_add_widgets(struct snd_soc_codec *codec)
                return ret;
        }
 
-       return snd_soc_dapm_new_widgets(codec);
+       return 0;
 }
 
 static int wm8350_set_dai_sysclk(struct snd_soc_dai *codec_dai,

diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 584af68..b432f4d 100644 (file)
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -915,7 +915,6 @@ static int wm8400_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index e3c21eb..265e68c 100644 (file)
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -219,7 +219,6 @@ static int wm8510_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 2e2b01d..d3a61d7 100644 (file)
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -117,7 +117,6 @@ static int wm8523_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index dde50d1..d077df6 100644 (file)
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -315,7 +315,6 @@ static int wm8580_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 70e0675..24a3560 100644 (file)
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -99,7 +99,6 @@ static int wm8711_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index 1252a8a..3fb653b 100644 (file)
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -74,8 +74,6 @@ static int wm8728_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
-       snd_soc_dapm_new_widgets(codec);
-
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index e3675e7..3a49781 100644 (file)
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -159,7 +159,6 @@ static int wm8731_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 50a3d65..475c67a 100644 (file)
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -403,7 +403,6 @@ static int wm8750_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index c652bc0..d6850da 100644 (file)
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -673,7 +673,6 @@ static int wm8753_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 85f67db..c9438dd 100644 (file)
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -618,8 +618,6 @@ static int wm8900_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
-
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index bfeff4e..b8cae17 100644 (file)
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -919,8 +919,6 @@ static int wm8903_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
-       snd_soc_dapm_new_widgets(codec);
-
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index fc80aa6..3d850b9 100644 (file)
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -298,7 +298,6 @@ static int wm8940_add_widgets(struct snd_soc_codec *codec)
        ret = snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
        if (ret)
                goto error_ret;
-       ret = snd_soc_dapm_new_widgets(codec);
 
 error_ret:
        return ret;

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 40390af..d07bcc1 100644 (file)
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -307,7 +307,6 @@ static int wm8960_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index 07e3895..a8007d5 100644 (file)
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -986,7 +986,6 @@ static int wm8961_probe(struct platform_device *pdev)
        snd_soc_dapm_new_controls(codec, wm8961_dapm_widgets,
                                  ARRAY_SIZE(wm8961_dapm_widgets));
        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
-       snd_soc_dapm_new_widgets(codec);
 
        return ret;
 

diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index 56a66e8..d9540d5 100644 (file)
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -338,8 +338,6 @@ static int wm8971_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
-
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index c245f0e..81c57b5 100644 (file)
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -276,7 +276,6 @@ static int wm8974_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index bee292e..2862e4d 100644 (file)
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -790,7 +790,6 @@ static int wm8988_probe(struct platform_device *pdev)
        snd_soc_dapm_new_controls(codec, wm8988_dapm_widgets,
                                  ARRAY_SIZE(wm8988_dapm_widgets));
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
-       snd_soc_dapm_new_widgets(codec);
 
        return ret;
 

diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index e43cb2c..341481e 100644 (file)
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -920,7 +920,6 @@ static int wm8990_add_widgets(struct snd_soc_codec *codec)
        /* set up the WM8990 audio map */
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 0d4d2be..5e32f2e 100644 (file)
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1464,8 +1464,6 @@ static int wm8993_probe(struct platform_device *pdev)
        wm_hubs_add_analogue_routes(codec, wm8993->pdata.lineout1_diff,
                                    wm8993->pdata.lineout2_diff);
 
-       snd_soc_dapm_new_widgets(codec);
-
        return ret;
 
 err:

diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 3f1f844..c468497 100644 (file)
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -1262,7 +1262,6 @@ static int wm9081_probe(struct platform_device *pdev)
        snd_soc_dapm_new_controls(codec, wm9081_dapm_widgets,
                                  ARRAY_SIZE(wm9081_dapm_widgets));
        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
-       snd_soc_dapm_new_widgets(codec);
 
        return ret;
 

diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c
index 0e817b8..dfffc6c 100644 (file)
--- a/sound/soc/codecs/wm9705.c
+++ b/sound/soc/codecs/wm9705.c
@@ -205,7 +205,6 @@ static int wm9705_add_widgets(struct snd_soc_codec *codec)
        snd_soc_dapm_new_controls(codec, wm9705_dapm_widgets,
                                        ARRAY_SIZE(wm9705_dapm_widgets));
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
-       snd_soc_dapm_new_widgets(codec);
 
        return 0;
 }

diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 155cacf..2a08722 100644 (file)
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -436,7 +436,6 @@ static int wm9712_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 

diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index 5f81ecd..00bac31 100644 (file)
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -625,7 +625,6 @@ static int wm9713_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }