From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 27 Nov 2011 15:59:23 +0000 (+0000)
Subject: ASoC: Convert wm8996 to use devm_kzalloc()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a290986b2a184941da60921ada71bcb47a0d4af2;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

ASoC: Convert wm8996 to use devm_kzalloc()

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

diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 304a0e570cb4..41cc9d2d5ae9 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -3104,7 +3104,8 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c,
 	int ret, i;
 	unsigned int reg;
 
-	wm8996 = kzalloc(sizeof(struct wm8996_priv), GFP_KERNEL);
+	wm8996 = devm_kzalloc(&i2c->dev, sizeof(struct wm8996_priv),
+			      GFP_KERNEL);
 	if (wm8996 == NULL)
 		return -ENOMEM;
 
@@ -3216,7 +3217,6 @@ err_gpio:
 	if (wm8996->pdata.ldo_ena > 0)
 		gpio_free(wm8996->pdata.ldo_ena);
 err:
-	kfree(wm8996);
 
 	return ret;
 }
@@ -3234,7 +3234,6 @@ static __devexit int wm8996_i2c_remove(struct i2c_client *client)
 		gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0);
 		gpio_free(wm8996->pdata.ldo_ena);
 	}
-	kfree(wm8996);
 	return 0;
 }