Commit f6aa470f authored by Takashi Iwai's avatar Takashi Iwai

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
...@@ -1142,7 +1142,6 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) ...@@ -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) static int acp_dma_new(struct snd_soc_pcm_runtime *rtd)
{ {
int ret;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd,
DRV_NAME); DRV_NAME);
struct audio_drv_data *adata = dev_get_drvdata(component->dev); 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) ...@@ -1150,24 +1149,21 @@ static int acp_dma_new(struct snd_soc_pcm_runtime *rtd)
switch (adata->asic_type) { switch (adata->asic_type) {
case CHIP_STONEY: 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, SNDRV_DMA_TYPE_DEV,
parent, parent,
ST_MIN_BUFFER, ST_MIN_BUFFER,
ST_MAX_BUFFER); ST_MAX_BUFFER);
break; break;
default: default:
ret = snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,
SNDRV_DMA_TYPE_DEV, SNDRV_DMA_TYPE_DEV,
parent, parent,
MIN_BUFFER, MIN_BUFFER,
MAX_BUFFER); MAX_BUFFER);
break; break;
} }
if (ret < 0) return 0;
dev_err(component->dev,
"buffer preallocation failure error:%d\n", ret);
return ret;
} }
static int acp_dma_close(struct snd_pcm_substream *substream) static int acp_dma_close(struct snd_pcm_substream *substream)
......
...@@ -367,11 +367,10 @@ static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_pcm_substream *substream) ...@@ -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) static int acp3x_dma_new(struct snd_soc_pcm_runtime *rtd)
{ {
return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_DEV,
SNDRV_DMA_TYPE_DEV, rtd->pcm->card->dev,
rtd->pcm->card->dev, MIN_BUFFER, MAX_BUFFER);
MIN_BUFFER, return 0;
MAX_BUFFER);
} }
static int acp3x_dma_hw_free(struct snd_pcm_substream *substream) static int acp3x_dma_hw_free(struct snd_pcm_substream *substream)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment