Commit 84cbc75f authored by Sachin Kamat's avatar Sachin Kamat Committed by Mark Brown
Browse files

ASoC: wm0010: Remove redundant OOM message 



Let memory subsystem handle the error logging.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@samsung.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ac872d3d

sound/soc/codecs/wm0010.c

+1 −11
Original line number Original line Diff line number Diff line
@@ -413,7 +413,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) 




		xfer = kzalloc(sizeof(*xfer), GFP_KERNEL);

		xfer = kzalloc(sizeof(*xfer), GFP_KERNEL);

		if (!xfer) {

		if (!xfer) {

			dev_err(codec->dev, "Failed to allocate xfer\n");

			ret = -ENOMEM;

			ret = -ENOMEM;

			goto abort;

			goto abort;

		}

		}
@@ -423,8 +422,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) 




		out = kzalloc(len, GFP_KERNEL | GFP_DMA);

		out = kzalloc(len, GFP_KERNEL | GFP_DMA);

		if (!out) {

		if (!out) {

			dev_err(codec->dev,

				"Failed to allocate RX buffer\n");

			ret = -ENOMEM;

			ret = -ENOMEM;

			goto abort1;

			goto abort1;

		}

		}
@@ -432,8 +429,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) 




		img = kzalloc(len, GFP_KERNEL | GFP_DMA);

		img = kzalloc(len, GFP_KERNEL | GFP_DMA);

		if (!img) {

		if (!img) {

			dev_err(codec->dev,

				"Failed to allocate image buffer\n");

			ret = -ENOMEM;

			ret = -ENOMEM;

			goto abort1;

			goto abort1;

		}

		}
@@ -526,14 +521,12 @@ static int wm0010_stage2_load(struct snd_soc_codec *codec) 
	/* Copy to local buffer first as vmalloc causes problems for dma */

	/* Copy to local buffer first as vmalloc causes problems for dma */

	img = kzalloc(fw->size, GFP_KERNEL | GFP_DMA);

	img = kzalloc(fw->size, GFP_KERNEL | GFP_DMA);

	if (!img) {

	if (!img) {

		dev_err(codec->dev, "Failed to allocate image buffer\n");

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto abort2;

		goto abort2;

	}

	}





	out = kzalloc(fw->size, GFP_KERNEL | GFP_DMA);

	out = kzalloc(fw->size, GFP_KERNEL | GFP_DMA);

	if (!out) {

	if (!out) {

		dev_err(codec->dev, "Failed to allocate output buffer\n");

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto abort1;

		goto abort1;

	}

	}
@@ -679,11 +672,8 @@ static int wm0010_boot(struct snd_soc_codec *codec) 
		}

		}





		img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA);

		img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA);

		if (!img_swap) {

		if (!img_swap)

			dev_err(codec->dev,

				"Failed to allocate image buffer\n");

			goto abort;

			goto abort;

		}





		/* We need to re-order for 0010 */

		/* We need to re-order for 0010 */

		byte_swap_64((u64 *)&pll_rec, img_swap, len);

		byte_swap_64((u64 *)&pll_rec, img_swap, len);