Unverified Commit f183f927 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-pcm: add soc_rtd_startup() 



Add soc_rtd_startup() to make the code easier to read

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/878sm0mia4.wl-kuninori.morimoto.gx@renesas.com


Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent df310074

sound/soc/soc-pcm.c

+14 −7
Original line number Diff line number Diff line
@@ -28,6 +28,15 @@ 


#define DPCM_MAX_BE_USERS	8



static int soc_rtd_startup(struct snd_soc_pcm_runtime *rtd,

			   struct snd_pcm_substream *substream)

{

	if (rtd->dai_link->ops &&

	    rtd->dai_link->ops->startup)

		return rtd->dai_link->ops->startup(substream);

	return 0;

}



/**

 * snd_soc_runtime_activate() - Increment active count for PCM runtime components

 * @rtd: ASoC PCM runtime that is activated
@@ -522,14 +531,12 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) 
			codec_dai->rx_mask = 0;

	}



	if (rtd->dai_link->ops->startup) {

		ret = rtd->dai_link->ops->startup(substream);

	ret = soc_rtd_startup(rtd, substream);

	if (ret < 0) {

		pr_err("ASoC: %s startup failed: %d\n",

		       rtd->dai_link->name, ret);

		goto machine_err;

	}

	}



	/* Dynamic PCM DAI links compat checks use dynamic capabilities */

	if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm)

CRA Git | Maintained and supported by SUSTech CRA and CCSE