From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 24 Nov 2011 18:28:51 +0000 (+0000)
Subject: ASoC: Use devm_kzalloc() in wm5100
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~400
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a81b82c09e70db853cb270ed9ac166b6c50d7b8c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ASoC: Use devm_kzalloc() in wm5100

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 6c79d97ba181..844d5d287976 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -2607,7 +2607,8 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c,
 	unsigned int reg;
 	int ret, i;
 
-	wm5100 = kzalloc(sizeof(struct wm5100_priv), GFP_KERNEL);
+	wm5100 = devm_kzalloc(&i2c->dev, sizeof(struct wm5100_priv),
+			      GFP_KERNEL);
 	if (wm5100 == NULL)
 		return -ENOMEM;
 
@@ -2616,7 +2617,7 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c,
 		ret = PTR_ERR(wm5100->regmap);
 		dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
 			ret);
-		goto err_alloc;
+		goto err;
 	}
 
 	for (i = 0; i < ARRAY_SIZE(wm5100->fll); i++)
@@ -2774,8 +2775,7 @@ err_core:
 			    wm5100->core_supplies);
 err_regmap:
 	regmap_exit(wm5100->regmap);
-err_alloc:
-	kfree(wm5100);
+err:
 	return ret;
 }
 
@@ -2799,7 +2799,6 @@ static __devexit int wm5100_i2c_remove(struct i2c_client *client)
 	regulator_bulk_free(ARRAY_SIZE(wm5100->core_supplies),
 			    wm5100->core_supplies);
 	regmap_exit(wm5100->regmap);
-	kfree(wm5100);
 
 	return 0;
 }