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

ASoC: soc-component: add snd_soc_component_compr_set_params() 



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

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/87blg17v74.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -449,6 +449,8 @@ int snd_soc_component_compr_open(struct snd_compr_stream *cstream, 
void snd_soc_component_compr_free(struct snd_compr_stream *cstream,

				  struct snd_soc_component *last);

int snd_soc_component_compr_trigger(struct snd_compr_stream *cstream, int cmd);

int snd_soc_component_compr_set_params(struct snd_compr_stream *cstream,

				       struct snd_compr_params *params);



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

+21 −0
Original line number Diff line number Diff line
@@ -482,6 +482,27 @@ int snd_soc_component_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
}

EXPORT_SYMBOL_GPL(snd_soc_component_compr_trigger);



int snd_soc_component_compr_set_params(struct snd_compr_stream *cstream,

				       struct snd_compr_params *params)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_component *component;

	int i, ret;



	for_each_rtd_components(rtd, i, component) {

		if (component->driver->compress_ops &&

		    component->driver->compress_ops->set_params) {

			ret = component->driver->compress_ops->set_params(

				component, cstream, params);

			if (ret < 0)

				return soc_component_ret(component, ret);

		}

	}



	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_component_compr_set_params);



static unsigned int soc_component_read_no_lock(

	struct snd_soc_component *component,

	unsigned int reg)

sound/soc/soc-compress.c

+2 −23
Original line number Diff line number Diff line
@@ -295,27 +295,6 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd) 
	return ret;

}



static int soc_compr_components_set_params(struct snd_compr_stream *cstream,

					   struct snd_compr_params *params)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_component *component;

	int i, ret;



	for_each_rtd_components(rtd, i, component) {

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

		    !component->driver->compress_ops->set_params)

			continue;



		ret = component->driver->compress_ops->set_params(

			component, cstream, params);

		if (ret < 0)

			return ret;

	}



	return 0;

}



static int soc_compr_set_params(struct snd_compr_stream *cstream,

				struct snd_compr_params *params)

{
@@ -337,7 +316,7 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, 
	if (ret < 0)

		goto err;



	ret = soc_compr_components_set_params(cstream, params);

	ret = snd_soc_component_compr_set_params(cstream, params);

	if (ret < 0)

		goto err;
@@ -394,7 +373,7 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, 
	if (ret < 0)

		goto out;



	ret = soc_compr_components_set_params(cstream, params);

	ret = snd_soc_component_compr_set_params(cstream, params);

	if (ret < 0)

		goto out;