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

ASoC: intel: baytrail: 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-22-tiwai@suse.de


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

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

+2 −17
Original line number Diff line number Diff line
@@ -102,8 +102,6 @@ static int sst_byt_pcm_hw_params(struct snd_soc_component *component, 
		return ret;

	}



	snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));



	ret = sst_byt_stream_buffer(byt, pcm_data->stream,

				    substream->dma_buffer.addr,

				    params_buffer_bytes(params));
@@ -121,17 +119,6 @@ static int sst_byt_pcm_hw_params(struct snd_soc_component *component, 
	return 0;

}



static int sst_byt_pcm_hw_free(struct snd_soc_component *component,

			       struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;



	dev_dbg(rtd->dev, "PCM: hw_free\n");

	snd_pcm_lib_free_pages(substream);



	return 0;

}



static int sst_byt_pcm_restore_stream_context(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -315,9 +302,8 @@ static int sst_byt_pcm_new(struct snd_soc_component *component, 
	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream ||

	    pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		size = sst_byt_pcm_hardware.buffer_bytes_max;

		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

						      pdata->dma_dev,

						      size, size);

		snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,

					       pdata->dma_dev, size, size);

	}



	return 0;
@@ -374,7 +360,6 @@ static const struct snd_soc_component_driver byt_dai_component = { 
	.open		= sst_byt_pcm_open,

	.close		= sst_byt_pcm_close,

	.hw_params	= sst_byt_pcm_hw_params,

	.hw_free	= sst_byt_pcm_hw_free,

	.trigger	= sst_byt_pcm_trigger,

	.pointer	= sst_byt_pcm_pointer,

	.mmap		= sst_byt_pcm_mmap,

CRA Git | Maintained and supported by SUSTech CRA and CCSE