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

ASoC: soc-link: convert not to use asoc_xxx() 



ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().

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


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 36570f32

sound/soc/soc-link.c

+7 −7
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int snd_soc_link_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 


int snd_soc_link_startup(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	int ret = 0;



	if (rtd->dai_link->ops &&
@@ -84,7 +84,7 @@ int snd_soc_link_startup(struct snd_pcm_substream *substream) 
void snd_soc_link_shutdown(struct snd_pcm_substream *substream,

			   int rollback)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);



	if (rollback && !soc_link_mark_match(rtd, substream, startup))

		return;
@@ -99,7 +99,7 @@ void snd_soc_link_shutdown(struct snd_pcm_substream *substream, 


int snd_soc_link_prepare(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	int ret = 0;



	if (rtd->dai_link->ops &&
@@ -112,7 +112,7 @@ int snd_soc_link_prepare(struct snd_pcm_substream *substream) 
int snd_soc_link_hw_params(struct snd_pcm_substream *substream,

			   struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	int ret = 0;



	if (rtd->dai_link->ops &&
@@ -128,7 +128,7 @@ int snd_soc_link_hw_params(struct snd_pcm_substream *substream, 


void snd_soc_link_hw_free(struct snd_pcm_substream *substream, int rollback)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);



	if (rollback && !soc_link_mark_match(rtd, substream, hw_params))

		return;
@@ -143,7 +143,7 @@ void snd_soc_link_hw_free(struct snd_pcm_substream *substream, int rollback) 


static int soc_link_trigger(struct snd_pcm_substream *substream, int cmd)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	int ret = 0;



	if (rtd->dai_link->ops &&
@@ -156,7 +156,7 @@ static int soc_link_trigger(struct snd_pcm_substream *substream, int cmd) 
int snd_soc_link_trigger(struct snd_pcm_substream *substream, int cmd,

			 int rollback)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	int ret = 0;



	switch (cmd) {