Commit f6aa470f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ASoC: amd: Drop superfluous PCM preallocation error checks 



snd_pcm_lib_preallocate_pages() and co always succeed, so the error
check is simply redundant.  Drop it.

Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4d1b5303

sound/soc/amd/acp-pcm-dma.c

+11 −15
Original line number Diff line number Diff line
@@ -1142,7 +1142,6 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) 


static int acp_dma_new(struct snd_soc_pcm_runtime *rtd)

{

	int ret;

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd,

								    DRV_NAME);

	struct audio_drv_data *adata = dev_get_drvdata(component->dev);
@@ -1150,24 +1149,21 @@ static int acp_dma_new(struct snd_soc_pcm_runtime *rtd) 


	switch (adata->asic_type) {

	case CHIP_STONEY:

		ret = snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,

		snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,

						      SNDRV_DMA_TYPE_DEV,

						      parent,

						      ST_MIN_BUFFER,

						      ST_MAX_BUFFER);

		break;

	default:

		ret = snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,

		snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,

						      SNDRV_DMA_TYPE_DEV,

						      parent,

						      MIN_BUFFER,

						      MAX_BUFFER);

		break;

	}

	if (ret < 0)

		dev_err(component->dev,

			"buffer preallocation failure error:%d\n", ret);

	return ret;

	return 0;

}



static int acp_dma_close(struct snd_pcm_substream *substream)

sound/soc/amd/raven/acp3x-pcm-dma.c

+4 −5
Original line number Diff line number Diff line
@@ -367,11 +367,10 @@ static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_pcm_substream *substream) 


static int acp3x_dma_new(struct snd_soc_pcm_runtime *rtd)

{

	return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,

						     SNDRV_DMA_TYPE_DEV,

	snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_DEV,

					      rtd->pcm->card->dev,

						     MIN_BUFFER,

						     MAX_BUFFER);

					      MIN_BUFFER, MAX_BUFFER);

	return 0;

}



static int acp3x_dma_hw_free(struct snd_pcm_substream *substream)