renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 19:23:57 +08:00
Code

ASoC: wm8958: Remove redundant OOM message

Browse Source 
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>
This commit is contained in:
Sachin Kamat 2014-06-20 15:29:09 +05:30 committed by Mark Brown
parent d931099beb
commit 2cec4ff7f0
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sound/soc/codecs/wm8958-dsp2.c
View File

@ -934,12 +934,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
/* We need an array of texts for the enum API */ /* We need an array of texts for the enum API */
wm8994->mbc_texts = kmalloc(sizeof(char *) wm8994->mbc_texts = kmalloc(sizeof(char *)
* pdata->num_mbc_cfgs, GFP_KERNEL); * pdata->num_mbc_cfgs, GFP_KERNEL);
if (!wm8994->mbc_texts) { if (!wm8994->mbc_texts)
dev_err(wm8994->hubs.codec->dev,
"Failed to allocate %d MBC config texts\n",
pdata->num_mbc_cfgs);
return; return;
}
for (i = 0; i < pdata->num_mbc_cfgs; i++) for (i = 0; i < pdata->num_mbc_cfgs; i++)
wm8994->mbc_texts[i] = pdata->mbc_cfgs[i].name; wm8994->mbc_texts[i] = pdata->mbc_cfgs[i].name;
@ -963,12 +959,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
/* We need an array of texts for the enum API */ /* We need an array of texts for the enum API */
wm8994->vss_texts = kmalloc(sizeof(char *) wm8994->vss_texts = kmalloc(sizeof(char *)
* pdata->num_vss_cfgs, GFP_KERNEL); * pdata->num_vss_cfgs, GFP_KERNEL);
if (!wm8994->vss_texts) { if (!wm8994->vss_texts)
dev_err(wm8994->hubs.codec->dev,
"Failed to allocate %d VSS config texts\n",
pdata->num_vss_cfgs);
return; return;
}
for (i = 0; i < pdata->num_vss_cfgs; i++) for (i = 0; i < pdata->num_vss_cfgs; i++)
wm8994->vss_texts[i] = pdata->vss_cfgs[i].name; wm8994->vss_texts[i] = pdata->vss_cfgs[i].name;
@ -993,12 +985,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
/* We need an array of texts for the enum API */ /* We need an array of texts for the enum API */
wm8994->vss_hpf_texts = kmalloc(sizeof(char *) wm8994->vss_hpf_texts = kmalloc(sizeof(char *)
* pdata->num_vss_hpf_cfgs, GFP_KERNEL); * pdata->num_vss_hpf_cfgs, GFP_KERNEL);
if (!wm8994->vss_hpf_texts) { if (!wm8994->vss_hpf_texts)
dev_err(wm8994->hubs.codec->dev,
"Failed to allocate %d VSS HPF config texts\n",
pdata->num_vss_hpf_cfgs);
return; return;
}
for (i = 0; i < pdata->num_vss_hpf_cfgs; i++) for (i = 0; i < pdata->num_vss_hpf_cfgs; i++)
wm8994->vss_hpf_texts[i] = pdata->vss_hpf_cfgs[i].name; wm8994->vss_hpf_texts[i] = pdata->vss_hpf_cfgs[i].name;
@ -1024,12 +1012,8 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
/* We need an array of texts for the enum API */ /* We need an array of texts for the enum API */
wm8994->enh_eq_texts = kmalloc(sizeof(char *) wm8994->enh_eq_texts = kmalloc(sizeof(char *)
* pdata->num_enh_eq_cfgs, GFP_KERNEL); * pdata->num_enh_eq_cfgs, GFP_KERNEL);
if (!wm8994->enh_eq_texts) { if (!wm8994->enh_eq_texts)
dev_err(wm8994->hubs.codec->dev,
"Failed to allocate %d enhanced EQ config texts\n",
pdata->num_enh_eq_cfgs);
return; return;
}
for (i = 0; i < pdata->num_enh_eq_cfgs; i++) for (i = 0; i < pdata->num_enh_eq_cfgs; i++)
wm8994->enh_eq_texts[i] = pdata->enh_eq_cfgs[i].name; wm8994->enh_eq_texts[i] = pdata->enh_eq_cfgs[i].name;