| Message ID | 87k10ry3ao.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_copy(). > > 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 0e05aedaee05..255014fe6264 100644 > --- a/include/sound/soc-component.h > +++ b/include/sound/soc-component.h > @@ -452,6 +452,8 @@ int snd_soc_component_compr_get_codec_caps(struct > snd_compr_stream *cstream, > 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_component_compr_copy(struct snd_compr_stream *cstream, > + char __user *buf, size_t count); > > 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 8a24d6f3572a..6a47255767a0 100644 > --- a/sound/soc/soc-component.c > +++ b/sound/soc/soc-component.c > @@ -570,6 +570,27 @@ int snd_soc_component_compr_pointer(struct > snd_compr_stream *cstream, > } > EXPORT_SYMBOL_GPL(snd_soc_component_compr_pointer); > > +int snd_soc_component_compr_copy(struct snd_compr_stream *cstream, > + char __user *buf, size_t count) > +{ > + 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->copy) { > + ret = component->driver->compress_ops->copy( > + component, cstream, buf, count); > + if (ret < 0) > + return soc_component_ret(component, > ret); Same here as well. Should we return in all cases? Thanks, Ranjani
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h index 0e05aedaee05..255014fe6264 100644 --- a/include/sound/soc-component.h +++ b/include/sound/soc-component.h @@ -452,6 +452,8 @@ int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream, 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_component_compr_copy(struct snd_compr_stream *cstream, + char __user *buf, size_t count); 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 8a24d6f3572a..6a47255767a0 100644 --- a/sound/soc/soc-component.c +++ b/sound/soc/soc-component.c @@ -570,6 +570,27 @@ int snd_soc_component_compr_pointer(struct snd_compr_stream *cstream, } EXPORT_SYMBOL_GPL(snd_soc_component_compr_pointer); +int snd_soc_component_compr_copy(struct snd_compr_stream *cstream, + char __user *buf, size_t count) +{ + 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->copy) { + ret = component->driver->compress_ops->copy( + component, cstream, buf, count); + if (ret < 0) + return soc_component_ret(component, ret); + } + } + + return 0; +} +EXPORT_SYMBOL_GPL(snd_soc_component_compr_copy); + 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 39fe2c58fa88..7e05f263b655 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -516,20 +516,11 @@ static int soc_compr_copy(struct snd_compr_stream *cstream, char __user *buf, size_t count) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_component *component; - int i, ret = 0; + int ret; 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->copy) - continue; - - ret = component->driver->compress_ops->copy( - component, cstream, buf, count); - break; - } + ret = snd_soc_component_compr_copy(cstream, buf, count); mutex_unlock(&rtd->card->pcm_mutex); return ret;