commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=141e45d2bcaccc02362676f9bc256542747534c1
branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk

snd_soc_add_controls is obsolete.

Signed-off-by: Scott Jiang <[email protected]>
---
 sound/soc/codecs/ad73311.c  |    2 +-
 sound/soc/codecs/adau1761.c |    6 +++---
 sound/soc/codecs/adau17x1.c |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/ad73311.c b/sound/soc/codecs/ad73311.c
index 4faefc3..aace523 100644
--- a/sound/soc/codecs/ad73311.c
+++ b/sound/soc/codecs/ad73311.c
@@ -154,7 +154,7 @@ static const struct snd_kcontrol_new ad73311_snd_controls[] = {
 
 static int ad73311_soc_probe(struct snd_soc_codec *codec)
 {
-	snd_soc_add_controls(codec, ad73311_snd_controls,
+	snd_soc_add_codec_controls(codec, ad73311_snd_controls,
 			ARRAY_SIZE(ad73311_snd_controls));
 	return 0;
 }
diff --git a/sound/soc/codecs/adau1761.c b/sound/soc/codecs/adau1761.c
index c07ef49..6cc1a4f 100644
--- a/sound/soc/codecs/adau1761.c
+++ b/sound/soc/codecs/adau1761.c
@@ -494,7 +494,7 @@ static int adau1761_setup_digmic_jackdetect(struct snd_soc_codec *codec)
 		if (pdata->jackdetect_active_low)
 			val |= ADAU1761_DIGMIC_JACKDETECT_ACTIVE_LOW;
 
-		ret = snd_soc_add_controls(codec,
+		ret = snd_soc_add_codec_controls(codec,
 			adau1761_jack_detect_controls,
 			ARRAY_SIZE(adau1761_jack_detect_controls));
 		if (ret)
@@ -629,13 +629,13 @@ static int adau1761_probe(struct snd_soc_codec *codec)
 		regmap_update_bits(adau->regmap, ADAU1761_RIGHT_DIFF_INPUT_VOL,
 			ADAU1761_DIFF_INPUT_VOL_LDEN,
 			ADAU1761_DIFF_INPUT_VOL_LDEN);
-		ret = snd_soc_add_controls(codec,
+		ret = snd_soc_add_codec_controls(codec,
 			adau1761_differential_mode_controls,
 			ARRAY_SIZE(adau1761_differential_mode_controls));
 		if (ret)
 			return ret;
 	} else {
-		ret = snd_soc_add_controls(codec,
+		ret = snd_soc_add_codec_controls(codec,
 			adau1761_single_mode_controls,
 			ARRAY_SIZE(adau1761_single_mode_controls));
 		if (ret)
diff --git a/sound/soc/codecs/adau17x1.c b/sound/soc/codecs/adau17x1.c
index 69d513e..1fe1645 100644
--- a/sound/soc/codecs/adau17x1.c
+++ b/sound/soc/codecs/adau17x1.c
@@ -765,7 +765,7 @@ int adau17x1_probe(struct snd_soc_codec *codec)
 
 	codec->driver->set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-	ret = snd_soc_add_controls(codec, adau17x1_controls,
+	ret = snd_soc_add_codec_controls(codec, adau17x1_controls,
 		ARRAY_SIZE(adau17x1_controls));
 	if (ret)
 		return ret;
@@ -781,7 +781,7 @@ int adau17x1_probe(struct snd_soc_codec *codec)
 	if (!adau17x1_has_dsp(adau))
 		return 0;
 
-	ret = snd_soc_add_controls(codec, adau17x1_dsp_controls,
+	ret = snd_soc_add_codec_controls(codec, adau17x1_dsp_controls,
 		ARRAY_SIZE(adau17x1_dsp_controls));
 	if (ret)
 		return ret;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to