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

ASoC: soc-component: add snd_soc_component_compr_free() 



component related function should be implemented at
soc-component.c.
This patch moves soc-compress soc_compr_components_free()
to soc-component as snd_soc_component_compr_free().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87eekx7v7r.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -446,6 +446,8 @@ int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component, 
					const char **dai_name);

int snd_soc_component_compr_open(struct snd_compr_stream *cstream,

				 struct snd_soc_component **last);

void snd_soc_component_compr_free(struct snd_compr_stream *cstream,

				  struct snd_soc_component *last);



int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream);

int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,

sound/soc/soc-component.c

+18 −0
Original line number Diff line number Diff line
@@ -444,6 +444,24 @@ int snd_soc_component_compr_open(struct snd_compr_stream *cstream, 
}

EXPORT_SYMBOL_GPL(snd_soc_component_compr_open);



void snd_soc_component_compr_free(struct snd_compr_stream *cstream,

				  struct snd_soc_component *last)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_component *component;

	int i;



	for_each_rtd_components(rtd, i, component) {

		if (component == last)

			break;



		if (component->driver->compress_ops &&

		    component->driver->compress_ops->free)

			component->driver->compress_ops->free(component, cstream);

	}

}

EXPORT_SYMBOL_GPL(snd_soc_component_compr_free);



static unsigned int soc_component_read_no_lock(

	struct snd_soc_component *component,

	unsigned int reg)

sound/soc/soc-compress.c

+4 −25
Original line number Diff line number Diff line
@@ -22,27 +22,6 @@ 
#include <sound/soc-link.h>

#include <linux/pm_runtime.h>



static int soc_compr_components_free(struct snd_compr_stream *cstream,

				     struct snd_soc_component *last)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_component *component;

	int i;



	for_each_rtd_components(rtd, i, component) {

		if (component == last)

			break;



		if (!component->driver->compress_ops ||

		    !component->driver->compress_ops->free)

			continue;



		component->driver->compress_ops->free(component, cstream);

	}



	return 0;

}



static int soc_compr_open(struct snd_compr_stream *cstream)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
@@ -76,7 +55,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream) 
	return 0;



machine_err:

	soc_compr_components_free(cstream, component);

	snd_soc_component_compr_free(cstream, component);



	snd_soc_dai_compr_shutdown(cpu_dai, cstream);

out:
@@ -150,7 +129,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) 
	return 0;



machine_err:

	soc_compr_components_free(cstream, component);

	snd_soc_component_compr_free(cstream, component);

open_err:

	snd_soc_dai_compr_shutdown(cpu_dai, cstream);

out:
@@ -182,7 +161,7 @@ static int soc_compr_free(struct snd_compr_stream *cstream) 


	snd_soc_link_compr_shutdown(cstream);



	soc_compr_components_free(cstream, NULL);

	snd_soc_component_compr_free(cstream, NULL);



	snd_soc_dai_compr_shutdown(cpu_dai, cstream);
@@ -230,7 +209,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) 


	snd_soc_link_compr_shutdown(cstream);



	soc_compr_components_free(cstream, NULL);

	snd_soc_component_compr_free(cstream, NULL);



	snd_soc_dai_compr_shutdown(cpu_dai, cstream);