Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit b423c420 authored Jul 22, 2019 by Kuninori Morimoto Committed by Mark Brown Jul 23, 2019

ASoC: soc-dai: add snd_soc_dai_compress_new()



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_compress_new() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87h87ehn1a.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent dcdab582

include/sound/soc-dai.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,8 @@ void snd_soc_dai_suspend(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_remove(struct snd_soc_dai *dai);
		int snd_soc_dai_compress_new(struct snd_soc_dai *dai,
		struct snd_soc_pcm_runtime *rtd, int num);

		struct snd_soc_dai_ops {
		/*

sound/soc/soc-core.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -1545,15 +1545,16 @@ static int soc_probe_link_dais(struct snd_soc_card *card,
		num = rtd->dai_link->id;
		}

		if (cpu_dai->driver->compress_new) {
		/* create compress_device" */
		ret = cpu_dai->driver->compress_new(rtd, num);
		if (ret < 0) {
		/* create compress_device if possible */
		ret = snd_soc_dai_compress_new(cpu_dai, rtd, num);
		if (ret != -ENOTSUPP) {
		if (ret < 0)
		dev_err(card->dev, "ASoC: can't create compress %s\n",
		dai_link->stream_name);
		return ret;
		}
		} else if (!dai_link->params) {

		if (!dai_link->params) {
		/* create the pcm */
		ret = soc_new_pcm(rtd, num);
		if (ret < 0) {

sound/soc/soc-dai.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -379,3 +379,11 @@ int snd_soc_dai_remove(struct snd_soc_dai *dai)
		return dai->driver->remove(dai);
		return 0;
		}

		int snd_soc_dai_compress_new(struct snd_soc_dai *dai,
		struct snd_soc_pcm_runtime *rtd, int num)
		{
		if (dai->driver->compress_new)
		return dai->driver->compress_new(rtd, num);
		return -ENOTSUPP;
		}