Skip to content

Commit

Permalink
Revert "ASoC: AC97 doesn't use regmap by default"
Browse files Browse the repository at this point in the history
Since commit 98d3088 (SoC: core: Fix check before defaulting to regmap)
, it is not necessary to provide codec->control_data anymore.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Fabio Estevam authored and Mark Brown committed Sep 11, 2012
1 parent 4ac7903 commit dbad34e
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion sound/soc/codecs/ad1980.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/stac9766.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/wm9712.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
1 change: 0 additions & 1 deletion sound/soc/codecs/wm9713.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit dbad34e

Please sign in to comment.