| Message ID | 87lfl7y3as.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: soc-component: collect component functions | expand |
On Mon, 2020-06-01 at 10:37 +0900, Kuninori Morimoto wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > component related function should be implemented at > soc-component.c. > This patch adds snd_soc_component_compr_pointer(). > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > include/sound/soc-component.h | 2 ++ > sound/soc/soc-component.c | 21 +++++++++++++++++++++ > sound/soc/soc-compress.c | 13 ++----------- > 3 files changed, 25 insertions(+), 11 deletions(-) > > diff --git a/include/sound/soc-component.h b/include/sound/soc- > component.h > index da1d89d0b476..0e05aedaee05 100644 > --- a/include/sound/soc-component.h > +++ b/include/sound/soc-component.h > @@ -450,6 +450,8 @@ int snd_soc_component_compr_get_caps(struct > snd_compr_stream *cstream, > int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream > *cstream, > struct snd_compr_codec_caps > *codec); > int snd_soc_component_compr_ack(struct snd_compr_stream *cstream, > size_t bytes); > +int snd_soc_component_compr_pointer(struct snd_compr_stream > *cstream, > + struct snd_compr_tstamp *tstamp); > > int snd_soc_pcm_component_pointer(struct snd_pcm_substream > *substream); > int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream, > diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c > index 8f223dd060e8..8a24d6f3572a 100644 > --- a/sound/soc/soc-component.c > +++ b/sound/soc/soc-component.c > @@ -549,6 +549,27 @@ int snd_soc_component_compr_ack(struct > snd_compr_stream *cstream, size_t bytes) > } > EXPORT_SYMBOL_GPL(snd_soc_component_compr_ack); > > +int snd_soc_component_compr_pointer(struct snd_compr_stream > *cstream, > + struct snd_compr_tstamp *tstamp) > +{ > + 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->pointer) { > + ret = component->driver->compress_ops->pointer( > + component, cstream, tstamp); > + if (ret < 0) > + return soc_component_ret(component, > ret); Morimoto-san, This seems slightly different from the original loop in soc_compr_pointer() where we break as soon as the condition is true. So should we return irrespective of the return value here? Thanks, Ranjani
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h index da1d89d0b476..0e05aedaee05 100644 --- a/include/sound/soc-component.h +++ b/include/sound/soc-component.h @@ -450,6 +450,8 @@ int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream, int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream, struct snd_compr_codec_caps *codec); int snd_soc_component_compr_ack(struct snd_compr_stream *cstream, size_t bytes); +int snd_soc_component_compr_pointer(struct snd_compr_stream *cstream, + struct snd_compr_tstamp *tstamp); int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream); int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream, diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c index 8f223dd060e8..8a24d6f3572a 100644 --- a/sound/soc/soc-component.c +++ b/sound/soc/soc-component.c @@ -549,6 +549,27 @@ int snd_soc_component_compr_ack(struct snd_compr_stream *cstream, size_t bytes) } EXPORT_SYMBOL_GPL(snd_soc_component_compr_ack); +int snd_soc_component_compr_pointer(struct snd_compr_stream *cstream, + struct snd_compr_tstamp *tstamp) +{ + 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->pointer) { + ret = component->driver->compress_ops->pointer( + component, cstream, tstamp); + if (ret < 0) + return soc_component_ret(component, ret); + } + } + + return 0; +} +EXPORT_SYMBOL_GPL(snd_soc_component_compr_pointer); + int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 4798c20bd9b5..39fe2c58fa88 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -497,8 +497,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, struct snd_compr_tstamp *tstamp) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_component *component; - int i, ret = 0; + int ret; struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass); @@ -507,15 +506,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, if (ret < 0) goto out; - for_each_rtd_components(rtd, i, component) { - if (!component->driver->compress_ops || - !component->driver->compress_ops->pointer) - continue; - - ret = component->driver->compress_ops->pointer( - component, cstream, tstamp); - break; - } + ret = snd_soc_component_compr_pointer(cstream, tstamp); out: mutex_unlock(&rtd->card->pcm_mutex); return ret;