mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 06:41:39 -04:00
ASoC: soc-component: remove pcm_construct()/pcm_destruct()
All driver have switched to use pcm_new()/pcm_free(), let's remove pcm_construct()/pcm_destruct(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/875x6wjyoa.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
committed by
Mark Brown
parent
667fb65f51
commit
175f733325
@@ -86,10 +86,6 @@ struct snd_soc_component_driver {
|
||||
unsigned int reg, unsigned int val);
|
||||
|
||||
/* pcm creation and destruction */
|
||||
int (*pcm_construct)(struct snd_soc_component *component,
|
||||
struct snd_soc_pcm_runtime *rtd);
|
||||
void (*pcm_destruct)(struct snd_soc_component *component,
|
||||
struct snd_pcm *pcm);
|
||||
int (*pcm_new)(struct snd_soc_component *component,
|
||||
struct snd_soc_pcm_runtime *rtd);
|
||||
void (*pcm_free)(struct snd_soc_component *component,
|
||||
|
||||
@@ -76,8 +76,7 @@ static bool soc_component_is_pcm(struct snd_soc_dai_link_component *dlc)
|
||||
{
|
||||
struct snd_soc_dai *dai = snd_soc_find_dai_with_mutex(dlc);
|
||||
|
||||
if (dai && (dai->component->driver->pcm_construct ||
|
||||
dai->component->driver->pcm_new ||
|
||||
if (dai && (dai->component->driver->pcm_new ||
|
||||
(dai->driver->ops && dai->driver->ops->pcm_new)))
|
||||
return true;
|
||||
|
||||
|
||||
@@ -1037,11 +1037,6 @@ int snd_soc_pcm_component_new(struct snd_soc_pcm_runtime *rtd)
|
||||
int i;
|
||||
|
||||
for_each_rtd_components(rtd, i, component) {
|
||||
if (component->driver->pcm_construct) {
|
||||
ret = component->driver->pcm_construct(component, rtd);
|
||||
if (ret < 0)
|
||||
return soc_component_ret(component, ret);
|
||||
}
|
||||
if (component->driver->pcm_new) {
|
||||
ret = component->driver->pcm_new(component, rtd);
|
||||
if (ret < 0)
|
||||
@@ -1060,12 +1055,9 @@ void snd_soc_pcm_component_free(struct snd_soc_pcm_runtime *rtd)
|
||||
if (!rtd->pcm)
|
||||
return;
|
||||
|
||||
for_each_rtd_components(rtd, i, component) {
|
||||
if (component->driver->pcm_destruct)
|
||||
component->driver->pcm_destruct(component, rtd->pcm);
|
||||
for_each_rtd_components(rtd, i, component)
|
||||
if (component->driver->pcm_free)
|
||||
component->driver->pcm_free(component, rtd->pcm);
|
||||
}
|
||||
}
|
||||
|
||||
int snd_soc_pcm_component_prepare(struct snd_pcm_substream *substream)
|
||||
|
||||
Reference in New Issue
Block a user