Commit d67fcb2d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-component: add snd_soc_component_compr_get_caps()

component related function should be implemented at
soc-component.c.
This patch adds snd_soc_component_compr_get_caps().
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/878sb57v6q.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 77c221ec
...@@ -453,6 +453,8 @@ int snd_soc_component_compr_set_params(struct snd_compr_stream *cstream, ...@@ -453,6 +453,8 @@ int snd_soc_component_compr_set_params(struct snd_compr_stream *cstream,
struct snd_compr_params *params); struct snd_compr_params *params);
int snd_soc_component_compr_get_params(struct snd_compr_stream *cstream, int snd_soc_component_compr_get_params(struct snd_compr_stream *cstream,
struct snd_codec *params); struct snd_codec *params);
int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream,
struct snd_compr_caps *caps);
int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream); int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream);
int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream, int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,
......
...@@ -523,6 +523,30 @@ int snd_soc_component_compr_get_params(struct snd_compr_stream *cstream, ...@@ -523,6 +523,30 @@ int snd_soc_component_compr_get_params(struct snd_compr_stream *cstream,
} }
EXPORT_SYMBOL_GPL(snd_soc_component_compr_get_params); EXPORT_SYMBOL_GPL(snd_soc_component_compr_get_params);
int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream,
struct snd_compr_caps *caps)
{
struct snd_soc_pcm_runtime *rtd = cstream->private_data;
struct snd_soc_component *component;
int i, ret = 0;
mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
for_each_rtd_components(rtd, i, component) {
if (component->driver->compress_ops &&
component->driver->compress_ops->get_caps) {
ret = component->driver->compress_ops->get_caps(
component, cstream, caps);
break;
}
}
mutex_unlock(&rtd->card->pcm_mutex);
return soc_component_ret(component, ret);
}
EXPORT_SYMBOL_GPL(snd_soc_component_compr_get_caps);
static unsigned int soc_component_read_no_lock( static unsigned int soc_component_read_no_lock(
struct snd_soc_component *component, struct snd_soc_component *component,
unsigned int reg) unsigned int reg)
......
...@@ -409,29 +409,6 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream, ...@@ -409,29 +409,6 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream,
return ret; return ret;
} }
static int soc_compr_get_caps(struct snd_compr_stream *cstream,
struct snd_compr_caps *caps)
{
struct snd_soc_pcm_runtime *rtd = cstream->private_data;
struct snd_soc_component *component;
int i, ret = 0;
mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
for_each_rtd_components(rtd, i, component) {
if (!component->driver->compress_ops ||
!component->driver->compress_ops->get_caps)
continue;
ret = component->driver->compress_ops->get_caps(
component, cstream, caps);
break;
}
mutex_unlock(&rtd->card->pcm_mutex);
return ret;
}
static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream, static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream,
struct snd_compr_codec_caps *codec) struct snd_compr_codec_caps *codec)
{ {
...@@ -596,7 +573,7 @@ static struct snd_compr_ops soc_compr_ops = { ...@@ -596,7 +573,7 @@ static struct snd_compr_ops soc_compr_ops = {
.trigger = soc_compr_trigger, .trigger = soc_compr_trigger,
.pointer = soc_compr_pointer, .pointer = soc_compr_pointer,
.ack = soc_compr_ack, .ack = soc_compr_ack,
.get_caps = soc_compr_get_caps, .get_caps = snd_soc_component_compr_get_caps,
.get_codec_caps = soc_compr_get_codec_caps .get_codec_caps = soc_compr_get_codec_caps
}; };
...@@ -611,7 +588,7 @@ static struct snd_compr_ops soc_compr_dyn_ops = { ...@@ -611,7 +588,7 @@ static struct snd_compr_ops soc_compr_dyn_ops = {
.trigger = soc_compr_trigger_fe, .trigger = soc_compr_trigger_fe,
.pointer = soc_compr_pointer, .pointer = soc_compr_pointer,
.ack = soc_compr_ack, .ack = soc_compr_ack,
.get_caps = soc_compr_get_caps, .get_caps = snd_soc_component_compr_get_caps,
.get_codec_caps = soc_compr_get_codec_caps .get_codec_caps = soc_compr_get_codec_caps
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment