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

ASoC: intel: haswell: Use managed buffer allocation 



Clean up the driver with the new managed buffer allocation API.
The hw_free callback became superfluous and got dropped.

Cc: Cezary Rojewski <cezary.rojewski@intel.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Cc: Jie Yang <yang.jie@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20191210142614.19405-23-tiwai@suse.de


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

sound/soc/intel/haswell/sst-haswell-pcm.c

+1 −16
Original line number Diff line number Diff line
@@ -592,13 +592,6 @@ static int hsw_pcm_hw_params(struct snd_soc_component *component, 
		return ret;

	}



	ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));

	if (ret < 0) {

		dev_err(rtd->dev, "error: could not allocate %d bytes for PCM %d\n",

			params_buffer_bytes(params), ret);

		return ret;

	}



	dmab = snd_pcm_get_dma_buf(substream);



	ret = create_adsp_page_table(substream, pdata, rtd, runtime->dma_area,
@@ -656,13 +649,6 @@ static int hsw_pcm_hw_params(struct snd_soc_component *component, 
	return 0;

}



static int hsw_pcm_hw_free(struct snd_soc_component *component,

			   struct snd_pcm_substream *substream)

{

	snd_pcm_lib_free_pages(substream);

	return 0;

}



static int hsw_pcm_trigger(struct snd_soc_component *component,

			   struct snd_pcm_substream *substream, int cmd)

{
@@ -930,7 +916,7 @@ static int hsw_pcm_new(struct snd_soc_component *component, 


	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream ||

			pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		snd_pcm_lib_preallocate_pages_for_all(pcm,

		snd_pcm_set_managed_buffer_all(pcm,

			SNDRV_DMA_TYPE_DEV_SG,

			dev,

			hsw_pcm_hardware.buffer_bytes_max,
@@ -1114,7 +1100,6 @@ static const struct snd_soc_component_driver hsw_dai_component = { 
	.open		= hsw_pcm_open,

	.close		= hsw_pcm_close,

	.hw_params	= hsw_pcm_hw_params,

	.hw_free	= hsw_pcm_hw_free,

	.trigger	= hsw_pcm_trigger,

	.pointer	= hsw_pcm_pointer,

	.pcm_construct	= hsw_pcm_new,

CRA Git | Maintained and supported by SUSTech CRA and CCSE