evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: core: Add function for ac97 codec registration

Browse source 
Add codec registration specific function in preparation
for DAI-multicodec support.

No functional change.

Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
[fparent@baylibre.com: Adapt to 3.14+]
Signed-off-by: Fabien Parent <fparent@baylibre.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Misael Lopez Cruz 2014-03-21 16:27:28 +01:00 • committed by Mark Brown
parent 2436a723f3
commit 02c9c7b91c
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sound/soc/soc-core.c
View file

@ -1552,14 +1552,15 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
} }
#ifdef CONFIG_SND_SOC_AC97_BUS #ifdef CONFIG_SND_SOC_AC97_BUS
static int soc_register_ac97_dai_link(struct snd_soc_pcm_runtime *rtd) static int soc_register_ac97_codec(struct snd_soc_codec *codec,
struct snd_soc_dai *codec_dai)
{ {
int ret; int ret;
/* Only instantiate AC97 if not already done by the adaptor /* Only instantiate AC97 if not already done by the adaptor
* for the generic AC97 subsystem. * for the generic AC97 subsystem.
*/ */
if (rtd->codec_dai->driver->ac97_control && !rtd->codec->ac97_registered) { if (codec_dai->driver->ac97_control && !codec->ac97_registered) {
/* /*
* It is possible that the AC97 device is already registered to * It is possible that the AC97 device is already registered to
* the device subsystem. This happens when the device is created * the device subsystem. This happens when the device is created
@ -1568,28 +1569,38 @@ static int soc_register_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
* *
* In those cases we don't try to register the device again. * In those cases we don't try to register the device again.
*/ */
if (!rtd->codec->ac97_created) if (!codec->ac97_created)
return 0; return 0;
ret = soc_ac97_dev_register(rtd->codec); ret = soc_ac97_dev_register(codec);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->codec->dev, dev_err(codec->dev,
"ASoC: AC97 device register failed: %d\n", ret); "ASoC: AC97 device register failed: %d\n", ret);
return ret; return ret;
} }
rtd->codec->ac97_registered = 1; codec->ac97_registered = 1;
} }
return 0; return 0;
} }
static void soc_unregister_ac97_dai_link(struct snd_soc_codec *codec) static int soc_register_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
{
return soc_register_ac97_codec(rtd->codec, rtd->codec_dai);
}
static void soc_unregister_ac97_codec(struct snd_soc_codec *codec)
{ {
if (codec->ac97_registered) { if (codec->ac97_registered) {
soc_ac97_dev_unregister(codec); soc_ac97_dev_unregister(codec);
codec->ac97_registered = 0; codec->ac97_registered = 0;
} }
} }
static void soc_unregister_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
{
soc_unregister_ac97_codec(rtd->codec);
}
#endif #endif
static int soc_check_aux_dev(struct snd_soc_card *card, int num) static int soc_check_aux_dev(struct snd_soc_card *card, int num)
@ -1888,7 +1899,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
dev_err(card->dev, dev_err(card->dev,
"ASoC: failed to register AC97: %d\n", ret); "ASoC: failed to register AC97: %d\n", ret);
while (--i >= 0) while (--i >= 0)
soc_unregister_ac97_dai_link(card->rtd[i].codec); soc_unregister_ac97_dai_link(&card->rtd[i]);
goto probe_aux_dev_err; goto probe_aux_dev_err;
} }
} }
@ -2324,7 +2335,7 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec)
{ {
mutex_lock(&codec->mutex); mutex_lock(&codec->mutex);
#ifdef CONFIG_SND_SOC_AC97_BUS #ifdef CONFIG_SND_SOC_AC97_BUS
soc_unregister_ac97_dai_link(codec); soc_unregister_ac97_codec(codec);
#endif #endif
kfree(codec->ac97->bus); kfree(codec->ac97->bus);
kfree(codec->ac97); kfree(codec->ac97);