Skip to content

Commit

Permalink
ASoC: soc-component: add snd_soc_component_compr_copy()
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87361d7v5z.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Nov 18, 2020
1 parent 03ecea6 commit b5852e6
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 24 deletions.
2 changes: 2 additions & 0 deletions include/sound/soc-component.h
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,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,
Expand Down
24 changes: 24 additions & 0 deletions sound/soc/soc-component.c
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,30 @@ 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 = 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->copy) {
ret = component->driver->compress_ops->copy(
component, cstream, buf, count);
break;
}
}

mutex_unlock(&rtd->card->pcm_mutex);

return soc_component_ret(component, ret);
}
EXPORT_SYMBOL_GPL(snd_soc_component_compr_copy);

static unsigned int soc_component_read_no_lock(
struct snd_soc_component *component,
unsigned int reg)
Expand Down
25 changes: 1 addition & 24 deletions sound/soc/soc-compress.c
Original file line number Diff line number Diff line change
Expand Up @@ -446,29 +446,6 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
return ret;
}

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;

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;
}

mutex_unlock(&rtd->card->pcm_mutex);
return ret;
}

static int soc_compr_set_metadata(struct snd_compr_stream *cstream,
struct snd_compr_metadata *metadata)
{
Expand Down Expand Up @@ -649,7 +626,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
!component->driver->compress_ops->copy)
continue;

compr->ops->copy = soc_compr_copy;
compr->ops->copy = snd_soc_component_compr_copy;
break;
}

Expand Down

0 comments on commit b5852e6

Please sign in to comment.