Skip to content

Commit

Permalink
ASoC: soc-component: add snd_soc_component_compr_free()
Browse files Browse the repository at this point in the history
component related function should be implemented at
soc-component.c.
This patch moves soc-compress soc_compr_components_free()
to soc-component as snd_soc_component_compr_free().

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/87eekx7v7r.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 a4e427c commit dbde5e2
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 25 deletions.
2 changes: 2 additions & 0 deletions include/sound/soc-component.h
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,8 @@ int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
const char **dai_name);
int snd_soc_component_compr_open(struct snd_compr_stream *cstream,
struct snd_soc_component **last);
void snd_soc_component_compr_free(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,
Expand Down
18 changes: 18 additions & 0 deletions sound/soc/soc-component.c
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,24 @@ int snd_soc_component_compr_open(struct snd_compr_stream *cstream,
}
EXPORT_SYMBOL_GPL(snd_soc_component_compr_open);

void snd_soc_component_compr_free(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;

for_each_rtd_components(rtd, i, component) {
if (component == last)
break;

if (component->driver->compress_ops &&
component->driver->compress_ops->free)
component->driver->compress_ops->free(component, cstream);
}
}
EXPORT_SYMBOL_GPL(snd_soc_component_compr_free);

static unsigned int soc_component_read_no_lock(
struct snd_soc_component *component,
unsigned int reg)
Expand Down
29 changes: 4 additions & 25 deletions sound/soc/soc-compress.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,6 @@
#include <sound/soc-link.h>
#include <linux/pm_runtime.h>

static int soc_compr_components_free(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;

for_each_rtd_components(rtd, i, component) {
if (component == last)
break;

if (!component->driver->compress_ops ||
!component->driver->compress_ops->free)
continue;

component->driver->compress_ops->free(component, cstream);
}

return 0;
}

static int soc_compr_open(struct snd_compr_stream *cstream)
{
struct snd_soc_pcm_runtime *rtd = cstream->private_data;
Expand Down Expand Up @@ -76,7 +55,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream)
return 0;

machine_err:
soc_compr_components_free(cstream, component);
snd_soc_component_compr_free(cstream, component);

snd_soc_dai_compr_shutdown(cpu_dai, cstream);
out:
Expand Down Expand Up @@ -150,7 +129,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
return 0;

machine_err:
soc_compr_components_free(cstream, component);
snd_soc_component_compr_free(cstream, component);
open_err:
snd_soc_dai_compr_shutdown(cpu_dai, cstream);
out:
Expand Down Expand Up @@ -182,7 +161,7 @@ static int soc_compr_free(struct snd_compr_stream *cstream)

snd_soc_link_compr_shutdown(cstream);

soc_compr_components_free(cstream, NULL);
snd_soc_component_compr_free(cstream, NULL);

snd_soc_dai_compr_shutdown(cpu_dai, cstream);

Expand Down Expand Up @@ -230,7 +209,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)

snd_soc_link_compr_shutdown(cstream);

soc_compr_components_free(cstream, NULL);
snd_soc_component_compr_free(cstream, NULL);

snd_soc_dai_compr_shutdown(cpu_dai, cstream);

Expand Down

0 comments on commit dbde5e2

Please sign in to comment.