Commit 3672beb8 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-component: add snd_soc_component_close()

Current ALSA SoC is directly using component->driver->ops->xxx,
thus, it is deep nested, and makes code difficult to read,
and is not good for encapsulation.
This patch adds new snd_soc_component_close() and use it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ef2d5rnr.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent ae2f4849
...@@ -341,5 +341,7 @@ int snd_soc_component_force_enable_pin_unlocked( ...@@ -341,5 +341,7 @@ int snd_soc_component_force_enable_pin_unlocked(
/* component driver ops */ /* component driver ops */
int snd_soc_component_open(struct snd_soc_component *component, int snd_soc_component_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);
int snd_soc_component_close(struct snd_soc_component *component,
struct snd_pcm_substream *substream);
#endif /* __SOC_COMPONENT_H */ #endif /* __SOC_COMPONENT_H */
...@@ -295,3 +295,13 @@ int snd_soc_component_open(struct snd_soc_component *component, ...@@ -295,3 +295,13 @@ int snd_soc_component_open(struct snd_soc_component *component,
return 0; return 0;
} }
int snd_soc_component_close(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{
if (component->driver->ops &&
component->driver->ops->close)
return component->driver->ops->close(substream);
return 0;
}
...@@ -465,6 +465,7 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream, ...@@ -465,6 +465,7 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream,
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_rtdcom_list *rtdcom;
struct snd_soc_component *component; struct snd_soc_component *component;
int ret = 0;
for_each_rtdcom(rtd, rtdcom) { for_each_rtdcom(rtd, rtdcom) {
component = rtdcom->component; component = rtdcom->component;
...@@ -472,14 +473,11 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream, ...@@ -472,14 +473,11 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream,
if (component == last) if (component == last)
break; break;
if (component->driver->ops && ret |= snd_soc_component_close(component, substream);
component->driver->ops->close)
component->driver->ops->close(substream);
snd_soc_component_module_put_when_close(component); snd_soc_component_module_put_when_close(component);
} }
return 0; return ret;
} }
/* /*
......
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