mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
ASoC: soc-component: add snd_soc_pcm_component_pcm_new()
Current ALSA SoC is directly using component->driver->xxx, thus, the code nested deeply, and it makes code difficult to read, and is not good for encapsulation. We want to implement component related function at soc-component.c, but, some of them need to care whole snd_soc_pcm_runtime (= rtd) connected component. Let's call component related function which need to care with for_each_rtdcom() loop as snd_soc_pcm_component_xxx(). This patch adds new snd_soc_pcm_component_pcm() and use it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://lore.kernel.org/r/87lfwl4czy.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
205875e1a1
commit
7484291e9b
3 changed files with 25 additions and 14 deletions
|
@ -381,5 +381,6 @@ struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
|
||||||
unsigned long offset);
|
unsigned long offset);
|
||||||
int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
|
int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
|
||||||
struct vm_area_struct *vma);
|
struct vm_area_struct *vma);
|
||||||
|
int snd_soc_pcm_component_new(struct snd_pcm *pcm);
|
||||||
|
|
||||||
#endif /* __SOC_COMPONENT_H */
|
#endif /* __SOC_COMPONENT_H */
|
||||||
|
|
|
@ -525,3 +525,23 @@ int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
|
||||||
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int snd_soc_pcm_component_new(struct snd_pcm *pcm)
|
||||||
|
{
|
||||||
|
struct snd_soc_pcm_runtime *rtd = pcm->private_data;
|
||||||
|
struct snd_soc_rtdcom_list *rtdcom;
|
||||||
|
struct snd_soc_component *component;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
for_each_rtdcom(rtd, rtdcom) {
|
||||||
|
component = rtdcom->component;
|
||||||
|
|
||||||
|
if (component->driver->pcm_new) {
|
||||||
|
ret = component->driver->pcm_new(rtd);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
|
@ -2823,7 +2823,6 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
|
||||||
{
|
{
|
||||||
struct snd_soc_dai *codec_dai;
|
struct snd_soc_dai *codec_dai;
|
||||||
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
||||||
struct snd_soc_component *component;
|
|
||||||
struct snd_soc_rtdcom_list *rtdcom;
|
struct snd_soc_rtdcom_list *rtdcom;
|
||||||
struct snd_pcm *pcm;
|
struct snd_pcm *pcm;
|
||||||
char new_name[64];
|
char new_name[64];
|
||||||
|
@ -2956,19 +2955,10 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
|
||||||
if (capture)
|
if (capture)
|
||||||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &rtd->ops);
|
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &rtd->ops);
|
||||||
|
|
||||||
for_each_rtdcom(rtd, rtdcom) {
|
ret = snd_soc_pcm_component_new(pcm);
|
||||||
component = rtdcom->component;
|
if (ret < 0) {
|
||||||
|
dev_err(rtd->dev, "ASoC: pcm constructor failed: %d\n", ret);
|
||||||
if (!component->driver->pcm_new)
|
return ret;
|
||||||
continue;
|
|
||||||
|
|
||||||
ret = component->driver->pcm_new(rtd);
|
|
||||||
if (ret < 0) {
|
|
||||||
dev_err(component->dev,
|
|
||||||
"ASoC: pcm constructor failed: %d\n",
|
|
||||||
ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pcm->private_free = soc_pcm_private_free;
|
pcm->private_free = soc_pcm_private_free;
|
||||||
|
|
Loading…
Reference in a new issue