ASoC: soc-component: add snd_soc_component_compr_trigger()
component related function should be implemented at soc-component.c. This patch moves soc-compress soc_compr_components_trigger() to soc-component as snd_soc_component_compr_trigger(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://lore.kernel.org/r/87d00h7v7k.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
dbde5e2114
Коммит
08aee25114
|
@ -448,6 +448,7 @@ 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_component_compr_trigger(struct snd_compr_stream *cstream, int cmd);
|
||||
|
||||
int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream);
|
||||
int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,
|
||||
|
|
|
@ -462,6 +462,26 @@ void snd_soc_component_compr_free(struct snd_compr_stream *cstream,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_component_compr_free);
|
||||
|
||||
int snd_soc_component_compr_trigger(struct snd_compr_stream *cstream, int cmd)
|
||||
{
|
||||
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->trigger) {
|
||||
ret = component->driver->compress_ops->trigger(
|
||||
component, cstream, cmd);
|
||||
if (ret < 0)
|
||||
return soc_component_ret(component, ret);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_component_compr_trigger);
|
||||
|
||||
static unsigned int soc_component_read_no_lock(
|
||||
struct snd_soc_component *component,
|
||||
unsigned int reg)
|
||||
|
|
|
@ -217,27 +217,6 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int soc_compr_components_trigger(struct snd_compr_stream *cstream,
|
||||
int cmd)
|
||||
{
|
||||
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->trigger)
|
||||
continue;
|
||||
|
||||
ret = component->driver->compress_ops->trigger(
|
||||
component, cstream, cmd);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = cstream->private_data;
|
||||
|
@ -248,7 +227,7 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
|
|||
|
||||
mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
|
||||
|
||||
ret = soc_compr_components_trigger(cstream, cmd);
|
||||
ret = snd_soc_component_compr_trigger(cstream, cmd);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
|
@ -279,7 +258,7 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
|
|||
|
||||
if (cmd == SND_COMPR_TRIGGER_PARTIAL_DRAIN ||
|
||||
cmd == SND_COMPR_TRIGGER_DRAIN)
|
||||
return soc_compr_components_trigger(cstream, cmd);
|
||||
return snd_soc_component_compr_trigger(cstream, cmd);
|
||||
|
||||
mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
|
||||
|
||||
|
@ -287,7 +266,7 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
|
|||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
ret = soc_compr_components_trigger(cstream, cmd);
|
||||
ret = snd_soc_component_compr_trigger(cstream, cmd);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче