Unverified Commit bf523463 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20191211172019.23206-1-tiwai@suse.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 01fec8cc

sound/soc/mediatek/common/mtk-afe-fe-dai.c

+1 −5
Original line number Diff line number Diff line
@@ -129,10 +129,6 @@ int mtk_afe_fe_hw_params(struct snd_pcm_substream *substream, 
	unsigned int rate = params_rate(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)

		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)

		afe->release_dram_resource(afe->dev);



	return snd_pcm_lib_free_pages(substream);

	return 0;

}

EXPORT_SYMBOL_GPL(mtk_afe_fe_hw_free);

sound/soc/mediatek/common/mtk-afe-platform-driver.c

+2 −10
Original line number Diff line number Diff line
@@ -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);



	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);

	return 0;

}

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 = {

	.name		= AFE_PCM_NAME,

	.pointer	= mtk_afe_pcm_pointer,

	.pcm_construct	= mtk_afe_pcm_new,

	.pcm_destruct	= mtk_afe_pcm_free,

};

EXPORT_SYMBOL_GPL(mtk_afe_pcm_platform);

sound/soc/mediatek/common/mtk-afe-platform-driver.h

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ snd_pcm_uframes_t mtk_afe_pcm_pointer(struct snd_soc_component *component, 
				      struct snd_pcm_substream *substream);

int mtk_afe_pcm_new(struct snd_soc_component *component,

		    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_add_sub_dai_control(struct snd_soc_component *component);

sound/soc/mediatek/mt6797/mt6797-afe-pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -714,7 +714,6 @@ static const struct snd_soc_component_driver mt6797_afe_component = { 
	.probe		= mt6797_afe_component_probe,

	.pointer	= mtk_afe_pcm_pointer,

	.pcm_construct	= mtk_afe_pcm_new,

	.pcm_destruct	= mtk_afe_pcm_free,

};



static int mt6797_dai_memif_register(struct mtk_base_afe *afe)

sound/soc/mediatek/mt8183/mt8183-afe-pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,6 @@ static const struct snd_soc_component_driver mt8183_afe_component = { 
	.probe		= mt8183_afe_component_probe,

	.pointer	= mtk_afe_pcm_pointer,

	.pcm_construct	= mtk_afe_pcm_new,

	.pcm_destruct	= mtk_afe_pcm_free,

};



static int mt8183_dai_memif_register(struct mtk_base_afe *afe)

CRA Git | Maintained and supported by SUSTech CRA and CCSE