ASoC: sh: Drop superfluous PCM preallocation error checks
snd_pcm_lib_preallocate_pages() and co always succeed, so the error check is simply redundant. Drop it. Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Jaroslav Kysela <perex@perex.cz> Acked-by: Mark Brown <broonie@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
fba3b09f18
commit
b76c7fe6c9
@ -1768,11 +1768,12 @@ static const struct snd_pcm_ops fsi_pcm_ops = {
|
|||||||
|
|
||||||
static int fsi_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
static int fsi_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
return snd_pcm_lib_preallocate_pages_for_all(
|
snd_pcm_lib_preallocate_pages_for_all(
|
||||||
rtd->pcm,
|
rtd->pcm,
|
||||||
SNDRV_DMA_TYPE_DEV,
|
SNDRV_DMA_TYPE_DEV,
|
||||||
rtd->card->snd_card->dev,
|
rtd->card->snd_card->dev,
|
||||||
PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);
|
PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1575,7 +1575,6 @@ static int rsnd_preallocate_pages(struct snd_soc_pcm_runtime *rtd,
|
|||||||
struct rsnd_priv *priv = rsnd_io_to_priv(io);
|
struct rsnd_priv *priv = rsnd_io_to_priv(io);
|
||||||
struct device *dev = rsnd_priv_to_dev(priv);
|
struct device *dev = rsnd_priv_to_dev(priv);
|
||||||
struct snd_pcm_substream *substream;
|
struct snd_pcm_substream *substream;
|
||||||
int err;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* use Audio-DMAC dev if we can use IPMMU
|
* use Audio-DMAC dev if we can use IPMMU
|
||||||
@ -1588,12 +1587,10 @@ static int rsnd_preallocate_pages(struct snd_soc_pcm_runtime *rtd,
|
|||||||
for (substream = rtd->pcm->streams[stream].substream;
|
for (substream = rtd->pcm->streams[stream].substream;
|
||||||
substream;
|
substream;
|
||||||
substream = substream->next) {
|
substream = substream->next) {
|
||||||
err = snd_pcm_lib_preallocate_pages(substream,
|
snd_pcm_lib_preallocate_pages(substream,
|
||||||
SNDRV_DMA_TYPE_DEV,
|
SNDRV_DMA_TYPE_DEV,
|
||||||
dev,
|
dev,
|
||||||
PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);
|
PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);
|
||||||
if (err < 0)
|
|
||||||
return err;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -541,15 +541,9 @@ static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
|||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = snd_pcm_lib_preallocate_pages_for_all(pcm,
|
snd_pcm_lib_preallocate_pages_for_all(pcm,
|
||||||
SNDRV_DMA_TYPE_DEV, card->dev,
|
SNDRV_DMA_TYPE_DEV, card->dev,
|
||||||
SIU_BUFFER_BYTES_MAX, SIU_BUFFER_BYTES_MAX);
|
SIU_BUFFER_BYTES_MAX, SIU_BUFFER_BYTES_MAX);
|
||||||
if (ret < 0) {
|
|
||||||
dev_err(card->dev,
|
|
||||||
"snd_pcm_lib_preallocate_pages_for_all() err=%d",
|
|
||||||
ret);
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
(*port_info)->pcm = pcm;
|
(*port_info)->pcm = pcm;
|
||||||
|
|
||||||
@ -562,11 +556,6 @@ static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
|||||||
|
|
||||||
dev_info(card->dev, "SuperH SIU driver initialized.\n");
|
dev_info(card->dev, "SuperH SIU driver initialized.\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail:
|
|
||||||
siu_free_port(siu_ports[pdev->id]);
|
|
||||||
dev_err(card->dev, "SIU: failed to initialize.\n");
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void siu_pcm_free(struct snd_pcm *pcm)
|
static void siu_pcm_free(struct snd_pcm *pcm)
|
||||||
|
Loading…
Reference in New Issue
Block a user