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 b4be96decf3243f45262bd5efbf7aa07a6e62eca..2c18e3d1b71e3aa993719f32c6a911ef9295d4f4 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 3b2222a0c8080afb482692c68b31873ca9d6efd4..5d489186c05bb036d5a98aa2bbaa4b0537ad38df 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 57a6846a9a1f724cfd18bc567b1704c49a173277..ff966567e2bad1e2f5a3ae39b782205cb7122399 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 364832ccd7483705414494530736d9faa6bd08d8..82fca284d00761c67ed920c000236b4e9fbd5bf8 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 dda751c885cb85dab4799ac8dba7141088789c1c..e000cdfec1ec20550abe154c2939bad4365e0e7b 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 b3130339d29a64ad8ebc07006a10787b3d261fc5..d2ff1cde6883c31412559540c7f3a37dcc2d06f8 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 ee8cb2c08b87c2911a82fca3cabccc149e103691..1709e3f614a8c68314d78ce997593db362ecd4d3 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 03cad250f58db3fc5e47342d3e30cb7a9645ea77..2b4dc2b0b01724aa91507e330860d9d7bc7e0eda 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 bff476d65d05da4c909d1bdbb6c352cb609cfe38..2a013e46ae14ab7ec30f489d1fc23f0cb2ab3b50 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 510b8b226f969d5d2ca23b80c60311c5bfe103b4..5f1681f6ca766531d07270e82c1f81494f0d86a4 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 a42e47d94630370336d2639647169eb82a5ddac6..a2763c2e7348cea2422b8b0f88f86a3002e40da2 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 2e35a354b166e870e799fd891f8ff4f7b6cbd523..f82125d9e85a750e0aefd4d9d3ed7db9f7e30ecb 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 584af68af22aacebf706a54d11fcdca74cc44b04..b432f4d4a3247bb4df2763bcc5c00a97779a7ed1 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 e3c21ebcc08ea1bc66226312c75d7e95be6e3173..265e68c75df8e2908bcf4bcba8724c8c12599013 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 2e2b01d6c82b65a786209a7b1dbb24e8ae3637d2..d3a61d7ea0c509414e4a113def31b547fba33d6b 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 dde50d118181f47a79a400e5e96b2c4c58018f3d..d077df6f5e7515a6cb98ab727bf83d4529b05274 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 70e0675b5d4a073bda3f10621400d40376bfc0af..24a35603bcf732d563034f4cd2491a78a76a0d20 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 1252a8a486a6250a7949bec0165fc7d81cedb7be..3fb653ba363a1da03ab8d702ab6add9b45e4cb34 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 e3675e7a9813707786563c956763ae78340c512d..3a497810f9391c36f9918f0a3c93e20dce5779e5 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 50a3d6590588c32f64363893cd213a230d6f2441..475c67ac7818e39e417d21c9a43fb96ab0833841 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 c652bc04cc8133fed3beed13ba5d880b670bb4bf..d6850dacda29fbc9e36f3155fb9cd0557d59168e 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 85f67dbe211d7b058857cb429c332b313e4cf0c7..c9438dd62df34afc439d17728d9aaa18e81d9f53 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 bfeff4ee5de9a70811e383598b409d3e087abc7c..b8cae17586425012f9456f350d154d368e7fee6e 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 fc80aa6c913c21e547cbaf817744ab11fec768f9..3d850b97037a69fed4961ea6eea3591e53617587 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 40390afa75f3ee8ed24cadf5d0ed193bf3be750d..d07bcc1e1c603ed9a86e06c2e293bdb51358d271 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 07e389574db18ebdba5c27e152032946082115a3..a8007d58813f77b4687223fe40f48820e4b71561 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 56a66e89ab91e80738384031ae5e01ed7afc5561..d9540d55fc89b6b96ec108f896cc7572f8c74176 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 c245f0ee0ec2d05f6709c18a5859d1d6513c281b..81c57b5c591c5d35676eae9d3dfa5f1858326149 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 bee292e37d1b6cc4bf9d8bfbcad5219eb82b61e0..2862e4dced27fc2ff20a338c3f4461674a4dcf21 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 e43cb2c8b915de4f2850d5356c5f38428b0ec181..341481e0e83004c285bdaf634838647cfcc12a14 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 0d4d2be92b64ae17593155617e772f4c19776b90..5e32f2ed5fc295e1d7fbf17197c7f68d55714f41 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 3f1f84421312e5e029255917e795a0299fea3140..c468497314ba4291314e856e26d3bb50c9c9b5b7 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 0e817b8705cd5eaa134185629e44c4999491c1ba..dfffc6c778c0ec2495831487da2c870130e5932c 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 155cacf124eae59833ed4470f2636ccff013d435..2a0872273007df81ec836a9a4ef5f39aa1c8bcc0 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 5f81ecd20a81899efe7907c7d6dd24c066cfe09d..00bac315fb3bb97de2df341e8db10a09380b312c 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;
 }