p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: soc-component: tidyup snd_soc_pcm_component_new/free() parameter 

This patch uses rtd instead of pcm at snd_soc_pcm_component_new/free()
parameter.
This is prepare for dai_link remove bug fix on topology.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87pnhqx89j.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-11-18 10:50:32 +09:00 committed by Mark Brown
parent eb65ccdb08
commit b2b2afbb48
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sound/soc-component.h
View File

@ -412,7 +412,7 @@ 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); int snd_soc_pcm_component_new(struct snd_soc_pcm_runtime *rtd);
void snd_soc_pcm_component_free(struct snd_pcm *pcm); void snd_soc_pcm_component_free(struct snd_soc_pcm_runtime *rtd);
#endif /* __SOC_COMPONENT_H */ #endif /* __SOC_COMPONENT_H */

8
sound/soc/soc-component.c
View File

@ -498,9 +498,8 @@ 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) int snd_soc_pcm_component_new(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_pcm_runtime *rtd = pcm->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; int ret;
@ -516,13 +515,12 @@ int snd_soc_pcm_component_new(struct snd_pcm *pcm)
return 0; return 0;
} }
void snd_soc_pcm_component_free(struct snd_pcm *pcm) void snd_soc_pcm_component_free(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_pcm_runtime *rtd = pcm->private_data;
struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_rtdcom_list *rtdcom;
struct snd_soc_component *component; struct snd_soc_component *component;
for_each_rtd_components(rtd, rtdcom, component) for_each_rtd_components(rtd, rtdcom, component)
if (component->driver->pcm_destruct) if (component->driver->pcm_destruct)
component->driver->pcm_destruct(component, pcm); component->driver->pcm_destruct(component, rtd->pcm);
} }

4
sound/soc/soc-pcm.c
View File

@ -2898,7 +2898,7 @@ static void soc_pcm_private_free(struct snd_pcm *pcm)
/* need to sync the delayed work before releasing resources */ /* need to sync the delayed work before releasing resources */
flush_delayed_work(&rtd->delayed_work); flush_delayed_work(&rtd->delayed_work);
snd_soc_pcm_component_free(pcm); snd_soc_pcm_component_free(rtd);
} }
/* create a new pcm */ /* create a new pcm */
@ -3036,7 +3036,7 @@ 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);
ret = snd_soc_pcm_component_new(pcm); ret = snd_soc_pcm_component_new(rtd);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "ASoC: pcm constructor failed: %d\n", ret); dev_err(rtd->dev, "ASoC: pcm constructor failed: %d\n", ret);
return ret; return ret;