summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm0010.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@samsung.com>2014-06-20 15:29:05 +0530
committerMark Brown <broonie@linaro.org>2014-06-27 12:48:22 +0100
commit84cbc75f9a72d646701ec4fb4accdfdc5f6f3ea2 (patch)
treebc10fa1a7ab607dd706c6d25a6d3846cb0619653 /sound/soc/codecs/wm0010.c
parentac872d3d72773d1ac8824fa6c04430efc72e2a43 (diff)
downloadlinux-84cbc75f9a72d646701ec4fb4accdfdc5f6f3ea2.tar.bz2
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>
Diffstat (limited to 'sound/soc/codecs/wm0010.c')
-rw-r--r--sound/soc/codecs/wm0010.c12
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)
xfer = kzalloc(sizeof(*xfer), GFP_KERNEL);
if (!xfer) {
- dev_err(codec->dev, "Failed to allocate xfer\n");
ret = -ENOMEM;
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);
if (!out) {
- dev_err(codec->dev,
- "Failed to allocate RX buffer\n");
ret = -ENOMEM;
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);
if (!img) {
- dev_err(codec->dev,
- "Failed to allocate image buffer\n");
ret = -ENOMEM;
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 */
img = kzalloc(fw->size, GFP_KERNEL | GFP_DMA);
if (!img) {
- dev_err(codec->dev, "Failed to allocate image buffer\n");
ret = -ENOMEM;
goto abort2;
}
out = kzalloc(fw->size, GFP_KERNEL | GFP_DMA);
if (!out) {
- dev_err(codec->dev, "Failed to allocate output buffer\n");
ret = -ENOMEM;
goto abort1;
}
@@ -679,11 +672,8 @@ static int wm0010_boot(struct snd_soc_codec *codec)
}
img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA);
- if (!img_swap) {
- dev_err(codec->dev,
- "Failed to allocate image buffer\n");
+ if (!img_swap)
goto abort;
- }
/* We need to re-order for 0010 */
byte_swap_64((u64 *)&pll_rec, img_swap, len);