iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: soc-dai: add snd_soc_dai_remove()

Browse Source 
Current ALSA SoC is directly using dai->driver->xxx,
thus, it has deep nested bracket, and it makes code unreadable.
This patch adds new snd_soc_dai_remvoe() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87imruhn1x.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-07-22 10:35:05 +09:00 committed by Mark Brown
parent cfd9b5fbfe
commit dcdab5820e
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc-dai.h
View File

@ -165,6 +165,7 @@ snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,
void snd_soc_dai_suspend(struct snd_soc_dai *dai); void snd_soc_dai_suspend(struct snd_soc_dai *dai);
void snd_soc_dai_resume(struct snd_soc_dai *dai); void snd_soc_dai_resume(struct snd_soc_dai *dai);
int snd_soc_dai_probe(struct snd_soc_dai *dai); int snd_soc_dai_probe(struct snd_soc_dai *dai);
int snd_soc_dai_remove(struct snd_soc_dai *dai);
struct snd_soc_dai_ops { struct snd_soc_dai_ops {
/* /*

13
sound/soc/soc-core.c
View File

@ -992,13 +992,12 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order)
dai->driver->remove_order != order) dai->driver->remove_order != order)
return; return;
if (dai->driver->remove) { err = snd_soc_dai_remove(dai);
err = dai->driver->remove(dai); if (err < 0)
if (err < 0) dev_err(dai->dev,
dev_err(dai->dev, "ASoC: failed to remove %s: %d\n",
"ASoC: failed to remove %s: %d\n", dai->name, err);
dai->name, err);
}
dai->probed = 0; dai->probed = 0;
} }

7
sound/soc/soc-dai.c
View File

@ -372,3 +372,10 @@ int snd_soc_dai_probe(struct snd_soc_dai *dai)
return dai->driver->probe(dai); return dai->driver->probe(dai);
return 0; return 0;
} }
int snd_soc_dai_remove(struct snd_soc_dai *dai)
{
if (dai->driver->remove)
return dai->driver->remove(dai);
return 0;
}