Commit dbad34ea authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

Revert "ASoC: AC97 doesn't use regmap by default" 



Since commit 98d3088e (SoC: core: Fix check before defaulting to regmap)
, it is not necessary to provide codec->control_data anymore.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 4ac7903f

sound/soc/codecs/ad1980.c

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec) 


	printk(KERN_INFO "AD1980 SoC Audio Codec\n");



	codec->control_data = codec;	/* we don't use regmap! */

	ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);

	if (ret < 0) {

		printk(KERN_ERR "ad1980: failed to register AC97 codec\n");

sound/soc/codecs/stac9766.c

+0 −1
Original line number Diff line number Diff line
@@ -340,7 +340,6 @@ static int stac9766_codec_probe(struct snd_soc_codec *codec) 


	printk(KERN_INFO "STAC9766 SoC Audio Codec %s\n", STAC9766_VERSION);



	codec->control_data = codec;	/* we don't use regmap! */

	ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);

	if (ret < 0)

		goto codec_err;

sound/soc/codecs/wm9712.c

+0 −1
Original line number Diff line number Diff line
@@ -635,7 +635,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec) 
{

	int ret = 0;



	codec->control_data = codec;	/* we don't use regmap! */

	ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);

	if (ret < 0) {

		printk(KERN_ERR "wm9712: failed to register AC97 codec\n");

sound/soc/codecs/wm9713.c

+0 −1
Original line number Diff line number Diff line
@@ -1196,7 +1196,6 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) 
	if (wm9713 == NULL)

		return -ENOMEM;

	snd_soc_codec_set_drvdata(codec, wm9713);

	codec->control_data = wm9713;	/* we don't use regmap! */



	ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);

	if (ret < 0)