diff options
author | Sachin Kamat <sachin.kamat@samsung.com> | 2014-06-20 05:59:09 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-27 07:48:23 -0400 |
commit | 2cec4ff7f05e4f8721dc9c02d4ef4a8ad1ada7e8 (patch) | |
tree | 9c1b32a471b58f886f077421bf2087ebc868463e | |
parent | d931099bebdd057e77d47e5a990db6e769374bd5 (diff) |
ASoC: wm8958: 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/wm8958-dsp2.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c index b2ebb104d879..0dada7f0105e 100644 --- a/sound/soc/codecs/wm8958-dsp2.c +++ b/sound/soc/codecs/wm8958-dsp2.c | |||
@@ -934,12 +934,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec) | |||
934 | /* We need an array of texts for the enum API */ | 934 | /* We need an array of texts for the enum API */ |
935 | wm8994->mbc_texts = kmalloc(sizeof(char *) | 935 | wm8994->mbc_texts = kmalloc(sizeof(char *) |
936 | * pdata->num_mbc_cfgs, GFP_KERNEL); | 936 | * pdata->num_mbc_cfgs, GFP_KERNEL); |
937 | if (!wm8994->mbc_texts) { | 937 | if (!wm8994->mbc_texts) |
938 | dev_err(wm8994->hubs.codec->dev, | ||
939 | "Failed to allocate %d MBC config texts\n", | ||
940 | pdata->num_mbc_cfgs); | ||
941 | return; | 938 | return; |
942 | } | ||
943 | 939 | ||
944 | for (i = 0; i < pdata->num_mbc_cfgs; i++) | 940 | for (i = 0; i < pdata->num_mbc_cfgs; i++) |
945 | wm8994->mbc_texts[i] = pdata->mbc_cfgs[i].name; | 941 | wm8994->mbc_texts[i] = pdata->mbc_cfgs[i].name; |
@@ -963,12 +959,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec) | |||
963 | /* We need an array of texts for the enum API */ | 959 | /* We need an array of texts for the enum API */ |
964 | wm8994->vss_texts = kmalloc(sizeof(char *) | 960 | wm8994->vss_texts = kmalloc(sizeof(char *) |
965 | * pdata->num_vss_cfgs, GFP_KERNEL); | 961 | * pdata->num_vss_cfgs, GFP_KERNEL); |
966 | if (!wm8994->vss_texts) { | 962 | if (!wm8994->vss_texts) |
967 | dev_err(wm8994->hubs.codec->dev, | ||
968 | "Failed to allocate %d VSS config texts\n", | ||
969 | pdata->num_vss_cfgs); | ||
970 | return; | 963 | return; |
971 | } | ||
972 | 964 | ||
973 | for (i = 0; i < pdata->num_vss_cfgs; i++) | 965 | for (i = 0; i < pdata->num_vss_cfgs; i++) |
974 | wm8994->vss_texts[i] = pdata->vss_cfgs[i].name; | 966 | wm8994->vss_texts[i] = pdata->vss_cfgs[i].name; |
@@ -993,12 +985,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec) | |||
993 | /* We need an array of texts for the enum API */ | 985 | /* We need an array of texts for the enum API */ |
994 | wm8994->vss_hpf_texts = kmalloc(sizeof(char *) | 986 | wm8994->vss_hpf_texts = kmalloc(sizeof(char *) |
995 | * pdata->num_vss_hpf_cfgs, GFP_KERNEL); | 987 | * pdata->num_vss_hpf_cfgs, GFP_KERNEL); |
996 | if (!wm8994->vss_hpf_texts) { | 988 | if (!wm8994->vss_hpf_texts) |
997 | dev_err(wm8994->hubs.codec->dev, | ||
998 | "Failed to allocate %d VSS HPF config texts\n", | ||
999 | pdata->num_vss_hpf_cfgs); | ||
1000 | return; | 989 | return; |
1001 | } | ||
1002 | 990 | ||
1003 | for (i = 0; i < pdata->num_vss_hpf_cfgs; i++) | 991 | for (i = 0; i < pdata->num_vss_hpf_cfgs; i++) |
1004 | wm8994->vss_hpf_texts[i] = pdata->vss_hpf_cfgs[i].name; | 992 | wm8994->vss_hpf_texts[i] = pdata->vss_hpf_cfgs[i].name; |
@@ -1024,12 +1012,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec) | |||
1024 | /* We need an array of texts for the enum API */ | 1012 | /* We need an array of texts for the enum API */ |
1025 | wm8994->enh_eq_texts = kmalloc(sizeof(char *) | 1013 | wm8994->enh_eq_texts = kmalloc(sizeof(char *) |
1026 | * pdata->num_enh_eq_cfgs, GFP_KERNEL); | 1014 | * pdata->num_enh_eq_cfgs, GFP_KERNEL); |
1027 | if (!wm8994->enh_eq_texts) { | 1015 | if (!wm8994->enh_eq_texts) |
1028 | dev_err(wm8994->hubs.codec->dev, | ||
1029 | "Failed to allocate %d enhanced EQ config texts\n", | ||
1030 | pdata->num_enh_eq_cfgs); | ||
1031 | return; | 1016 | return; |
1032 | } | ||
1033 | 1017 | ||
1034 | for (i = 0; i < pdata->num_enh_eq_cfgs; i++) | 1018 | for (i = 0; i < pdata->num_enh_eq_cfgs; i++) |
1035 | wm8994->enh_eq_texts[i] = pdata->enh_eq_cfgs[i].name; | 1019 | wm8994->enh_eq_texts[i] = pdata->enh_eq_cfgs[i].name; |