ASoC: soc-component: add snd_soc_component_compr_open()
component related function should be implemented at soc-component.c. This patch moves soc-compress soc_compr_components_open() to soc-component as snd_soc_component_compr_open(). 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/87ft5d7v7x.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
5268e0bf71
Коммит
a4e427c59a
|
@ -444,6 +444,8 @@ int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
|
|||
int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
|
||||
struct of_phandle_args *args,
|
||||
const char **dai_name);
|
||||
int snd_soc_component_compr_open(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,
|
||||
|
|
|
@ -421,6 +421,29 @@ EXPORT_SYMBOL_GPL(snd_soc_component_exit_regmap);
|
|||
|
||||
#endif
|
||||
|
||||
int snd_soc_component_compr_open(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, ret;
|
||||
|
||||
for_each_rtd_components(rtd, i, component) {
|
||||
if (component->driver->compress_ops &&
|
||||
component->driver->compress_ops->open) {
|
||||
ret = component->driver->compress_ops->open(component, cstream);
|
||||
if (ret < 0) {
|
||||
*last = component;
|
||||
return soc_component_ret(component, ret);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
*last = NULL;
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_soc_component_compr_open);
|
||||
|
||||
static unsigned int soc_component_read_no_lock(
|
||||
struct snd_soc_component *component,
|
||||
unsigned int reg)
|
||||
|
|
|
@ -22,33 +22,6 @@
|
|||
#include <sound/soc-link.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
|
||||
static int soc_compr_components_open(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, ret;
|
||||
|
||||
for_each_rtd_components(rtd, i, component) {
|
||||
if (!component->driver->compress_ops ||
|
||||
!component->driver->compress_ops->open)
|
||||
continue;
|
||||
|
||||
ret = component->driver->compress_ops->open(component, cstream);
|
||||
if (ret < 0) {
|
||||
dev_err(component->dev,
|
||||
"Compress ASoC: can't open platform %s: %d\n",
|
||||
component->name, ret);
|
||||
|
||||
*last = component;
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
*last = NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int soc_compr_components_free(struct snd_compr_stream *cstream,
|
||||
struct snd_soc_component *last)
|
||||
{
|
||||
|
@ -88,7 +61,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
|
|||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
ret = soc_compr_components_open(cstream, &component);
|
||||
ret = snd_soc_component_compr_open(cstream, &component);
|
||||
if (ret < 0)
|
||||
goto machine_err;
|
||||
|
||||
|
@ -156,7 +129,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
|
|||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
ret = soc_compr_components_open(cstream, &component);
|
||||
ret = snd_soc_component_compr_open(cstream, &component);
|
||||
if (ret < 0)
|
||||
goto open_err;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче