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

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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 fba3b09f

sound/soc/sh/fsi.c

+2 −1
Original line number Diff line number Diff line
@@ -1768,11 +1768,12 @@ static const struct snd_pcm_ops fsi_pcm_ops = { 


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,

		SNDRV_DMA_TYPE_DEV,

		rtd->card->snd_card->dev,

		PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);

	return 0;

}



/*

sound/soc/sh/rcar/core.c

+1 −4
Original line number Diff line number Diff line
@@ -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 device *dev = rsnd_priv_to_dev(priv);

	struct snd_pcm_substream *substream;

	int err;



	/*

	 * 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;

	     substream;

	     substream = substream->next) {

		err = snd_pcm_lib_preallocate_pages(substream,

		snd_pcm_lib_preallocate_pages(substream,

					SNDRV_DMA_TYPE_DEV,

					dev,

					PREALLOC_BUFFER, PREALLOC_BUFFER_MAX);

		if (err < 0)

			return err;

	}



	return 0;

sound/soc/sh/siu_pcm.c

+1 −12
Original line number Diff line number Diff line
@@ -541,15 +541,9 @@ static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd) 
		if (ret < 0)

			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,

				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;
@@ -562,11 +556,6 @@ static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd) 


	dev_info(card->dev, "SuperH SIU driver initialized.\n");

	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)