diff options
author | Sachin Kamat <sachin.kamat@samsung.com> | 2014-06-20 05:59:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-27 07:48:22 -0400 |
commit | 84cbc75f9a72d646701ec4fb4accdfdc5f6f3ea2 (patch) | |
tree | bc10fa1a7ab607dd706c6d25a6d3846cb0619653 | |
parent | ac872d3d72773d1ac8824fa6c04430efc72e2a43 (diff) |
ASoC: wm0010: Remove redundant OOM message
Let memory subsystem handle the error logging.
Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/codecs/wm0010.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 71ce3159a62e..982467c1d56a 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c | |||
@@ -413,7 +413,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) | |||
413 | 413 | ||
414 | xfer = kzalloc(sizeof(*xfer), GFP_KERNEL); | 414 | xfer = kzalloc(sizeof(*xfer), GFP_KERNEL); |
415 | if (!xfer) { | 415 | if (!xfer) { |
416 | dev_err(codec->dev, "Failed to allocate xfer\n"); | ||
417 | ret = -ENOMEM; | 416 | ret = -ENOMEM; |
418 | goto abort; | 417 | goto abort; |
419 | } | 418 | } |
@@ -423,8 +422,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) | |||
423 | 422 | ||
424 | out = kzalloc(len, GFP_KERNEL | GFP_DMA); | 423 | out = kzalloc(len, GFP_KERNEL | GFP_DMA); |
425 | if (!out) { | 424 | if (!out) { |
426 | dev_err(codec->dev, | ||
427 | "Failed to allocate RX buffer\n"); | ||
428 | ret = -ENOMEM; | 425 | ret = -ENOMEM; |
429 | goto abort1; | 426 | goto abort1; |
430 | } | 427 | } |
@@ -432,8 +429,6 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) | |||
432 | 429 | ||
433 | img = kzalloc(len, GFP_KERNEL | GFP_DMA); | 430 | img = kzalloc(len, GFP_KERNEL | GFP_DMA); |
434 | if (!img) { | 431 | if (!img) { |
435 | dev_err(codec->dev, | ||
436 | "Failed to allocate image buffer\n"); | ||
437 | ret = -ENOMEM; | 432 | ret = -ENOMEM; |
438 | goto abort1; | 433 | goto abort1; |
439 | } | 434 | } |
@@ -526,14 +521,12 @@ static int wm0010_stage2_load(struct snd_soc_codec *codec) | |||
526 | /* Copy to local buffer first as vmalloc causes problems for dma */ | 521 | /* Copy to local buffer first as vmalloc causes problems for dma */ |
527 | img = kzalloc(fw->size, GFP_KERNEL | GFP_DMA); | 522 | img = kzalloc(fw->size, GFP_KERNEL | GFP_DMA); |
528 | if (!img) { | 523 | if (!img) { |
529 | dev_err(codec->dev, "Failed to allocate image buffer\n"); | ||
530 | ret = -ENOMEM; | 524 | ret = -ENOMEM; |
531 | goto abort2; | 525 | goto abort2; |
532 | } | 526 | } |
533 | 527 | ||
534 | out = kzalloc(fw->size, GFP_KERNEL | GFP_DMA); | 528 | out = kzalloc(fw->size, GFP_KERNEL | GFP_DMA); |
535 | if (!out) { | 529 | if (!out) { |
536 | dev_err(codec->dev, "Failed to allocate output buffer\n"); | ||
537 | ret = -ENOMEM; | 530 | ret = -ENOMEM; |
538 | goto abort1; | 531 | goto abort1; |
539 | } | 532 | } |
@@ -679,11 +672,8 @@ static int wm0010_boot(struct snd_soc_codec *codec) | |||
679 | } | 672 | } |
680 | 673 | ||
681 | img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA); | 674 | img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA); |
682 | if (!img_swap) { | 675 | if (!img_swap) |
683 | dev_err(codec->dev, | ||
684 | "Failed to allocate image buffer\n"); | ||
685 | goto abort; | 676 | goto abort; |
686 | } | ||
687 | 677 | ||
688 | /* We need to re-order for 0010 */ | 678 | /* We need to re-order for 0010 */ |
689 | byte_swap_64((u64 *)&pll_rec, img_swap, len); | 679 | byte_swap_64((u64 *)&pll_rec, img_swap, len); |