leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Convert WM8350 to devm_kzalloc()

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2011-12-03 11:29:38 +00:00
parent b03e96e4d6
commit 0d1fe0d452
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/codecs/wm8350.c
View File

@ -1553,7 +1553,8 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)
return -EINVAL; return -EINVAL;
} }
priv = kzalloc(sizeof(struct wm8350_data), GFP_KERNEL); priv = devm_kzalloc(codec->dev, sizeof(struct wm8350_data),
GFP_KERNEL);
if (priv == NULL) if (priv == NULL)
return -ENOMEM; return -ENOMEM;
snd_soc_codec_set_drvdata(codec, priv); snd_soc_codec_set_drvdata(codec, priv);
@ -1564,7 +1565,7 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)
ret = regulator_bulk_get(wm8350->dev, ARRAY_SIZE(priv->supplies), ret = regulator_bulk_get(wm8350->dev, ARRAY_SIZE(priv->supplies),
priv->supplies); priv->supplies);
if (ret != 0) if (ret != 0)
goto err_priv; return ret;
wm8350->codec.codec = codec; wm8350->codec.codec = codec;
codec->control_data = wm8350; codec->control_data = wm8350;
@ -1640,10 +1641,6 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)
wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY); wm8350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0; return 0;
err_priv:
kfree(priv);
return ret;
} }
static int wm8350_codec_remove(struct snd_soc_codec *codec) static int wm8350_codec_remove(struct snd_soc_codec *codec)
@ -1676,7 +1673,7 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec)
wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA); wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);
regulator_bulk_free(ARRAY_SIZE(priv->supplies), priv->supplies); regulator_bulk_free(ARRAY_SIZE(priv->supplies), priv->supplies);
kfree(priv);
return 0; return 0;
} }