ASoC: mediatek: Use managed buffer allocation
Clean up the drivers with the new managed buffer allocation API. The superfluous snd_pcm_lib_malloc_pages() and snd_pcm_lib_free_pages() calls are dropped, as well as the superfluous snd_pcm_lib_preallocate_free_for_all() call. As of the result, hw_free and pcm_destruct ops became empty and got removed. Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://lore.kernel.org/r/20191211172019.23206-1-tiwai@suse.de Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
01fec8cce7
commit
bf523463d8
|
@ -129,10 +129,6 @@ int mtk_afe_fe_hw_params(struct snd_pcm_substream *substream,
|
||||||
unsigned int rate = params_rate(params);
|
unsigned int rate = params_rate(params);
|
||||||
snd_pcm_format_t format = params_format(params);
|
snd_pcm_format_t format = params_format(params);
|
||||||
|
|
||||||
ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
|
|
||||||
if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
if (afe->request_dram_resource)
|
if (afe->request_dram_resource)
|
||||||
afe->request_dram_resource(afe->dev);
|
afe->request_dram_resource(afe->dev);
|
||||||
|
|
||||||
|
@ -193,7 +189,7 @@ int mtk_afe_fe_hw_free(struct snd_pcm_substream *substream,
|
||||||
if (afe->release_dram_resource)
|
if (afe->release_dram_resource)
|
||||||
afe->release_dram_resource(afe->dev);
|
afe->release_dram_resource(afe->dev);
|
||||||
|
|
||||||
return snd_pcm_lib_free_pages(substream);
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(mtk_afe_fe_hw_free);
|
EXPORT_SYMBOL_GPL(mtk_afe_fe_hw_free);
|
||||||
|
|
||||||
|
|
|
@ -120,24 +120,16 @@ int mtk_afe_pcm_new(struct snd_soc_component *component,
|
||||||
struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
|
struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
|
||||||
|
|
||||||
size = afe->mtk_afe_hardware->buffer_bytes_max;
|
size = afe->mtk_afe_hardware->buffer_bytes_max;
|
||||||
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
|
snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
|
||||||
afe->dev, size, size);
|
afe->dev, size, size);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(mtk_afe_pcm_new);
|
EXPORT_SYMBOL_GPL(mtk_afe_pcm_new);
|
||||||
|
|
||||||
void mtk_afe_pcm_free(struct snd_soc_component *component,
|
|
||||||
struct snd_pcm *pcm)
|
|
||||||
{
|
|
||||||
snd_pcm_lib_preallocate_free_for_all(pcm);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(mtk_afe_pcm_free);
|
|
||||||
|
|
||||||
const struct snd_soc_component_driver mtk_afe_pcm_platform = {
|
const struct snd_soc_component_driver mtk_afe_pcm_platform = {
|
||||||
.name = AFE_PCM_NAME,
|
.name = AFE_PCM_NAME,
|
||||||
.pointer = mtk_afe_pcm_pointer,
|
.pointer = mtk_afe_pcm_pointer,
|
||||||
.pcm_construct = mtk_afe_pcm_new,
|
.pcm_construct = mtk_afe_pcm_new,
|
||||||
.pcm_destruct = mtk_afe_pcm_free,
|
|
||||||
};
|
};
|
||||||
EXPORT_SYMBOL_GPL(mtk_afe_pcm_platform);
|
EXPORT_SYMBOL_GPL(mtk_afe_pcm_platform);
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,6 @@ snd_pcm_uframes_t mtk_afe_pcm_pointer(struct snd_soc_component *component,
|
||||||
struct snd_pcm_substream *substream);
|
struct snd_pcm_substream *substream);
|
||||||
int mtk_afe_pcm_new(struct snd_soc_component *component,
|
int mtk_afe_pcm_new(struct snd_soc_component *component,
|
||||||
struct snd_soc_pcm_runtime *rtd);
|
struct snd_soc_pcm_runtime *rtd);
|
||||||
void mtk_afe_pcm_free(struct snd_soc_component *component,
|
|
||||||
struct snd_pcm *pcm);
|
|
||||||
|
|
||||||
int mtk_afe_combine_sub_dai(struct mtk_base_afe *afe);
|
int mtk_afe_combine_sub_dai(struct mtk_base_afe *afe);
|
||||||
int mtk_afe_add_sub_dai_control(struct snd_soc_component *component);
|
int mtk_afe_add_sub_dai_control(struct snd_soc_component *component);
|
||||||
|
|
|
@ -714,7 +714,6 @@ static const struct snd_soc_component_driver mt6797_afe_component = {
|
||||||
.probe = mt6797_afe_component_probe,
|
.probe = mt6797_afe_component_probe,
|
||||||
.pointer = mtk_afe_pcm_pointer,
|
.pointer = mtk_afe_pcm_pointer,
|
||||||
.pcm_construct = mtk_afe_pcm_new,
|
.pcm_construct = mtk_afe_pcm_new,
|
||||||
.pcm_destruct = mtk_afe_pcm_free,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static int mt6797_dai_memif_register(struct mtk_base_afe *afe)
|
static int mt6797_dai_memif_register(struct mtk_base_afe *afe)
|
||||||
|
|
|
@ -1052,7 +1052,6 @@ static const struct snd_soc_component_driver mt8183_afe_component = {
|
||||||
.probe = mt8183_afe_component_probe,
|
.probe = mt8183_afe_component_probe,
|
||||||
.pointer = mtk_afe_pcm_pointer,
|
.pointer = mtk_afe_pcm_pointer,
|
||||||
.pcm_construct = mtk_afe_pcm_new,
|
.pcm_construct = mtk_afe_pcm_new,
|
||||||
.pcm_destruct = mtk_afe_pcm_free,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static int mt8183_dai_memif_register(struct mtk_base_afe *afe)
|
static int mt8183_dai_memif_register(struct mtk_base_afe *afe)
|
||||||
|
|
Loading…
Reference in a new issue