aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-27 14:56:52 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-27 17:02:44 -0500
commitbe086aa8ca7aac8292db9f1a6a17756fb1cfda81 (patch)
tree01ce01253daabf2b9a31b71f1dd9aa476a65d2bf /sound/soc
parenta094b80bb603d602bef5d8c02faedab8d06ed484 (diff)
ASoC: Convert WM8962 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8962.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 018257c69bca..8810988522eb 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -4150,7 +4150,8 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
4150 unsigned int reg; 4150 unsigned int reg;
4151 int ret, i; 4151 int ret, i;
4152 4152
4153 wm8962 = kzalloc(sizeof(struct wm8962_priv), GFP_KERNEL); 4153 wm8962 = devm_kzalloc(&i2c->dev, sizeof(struct wm8962_priv),
4154 GFP_KERNEL);
4154 if (wm8962 == NULL) 4155 if (wm8962 == NULL)
4155 return -ENOMEM; 4156 return -ENOMEM;
4156 4157
@@ -4167,7 +4168,7 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
4167 wm8962->supplies); 4168 wm8962->supplies);
4168 if (ret != 0) { 4169 if (ret != 0) {
4169 dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret); 4170 dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
4170 goto err_alloc; 4171 goto err;
4171 } 4172 }
4172 4173
4173 ret = regulator_bulk_enable(ARRAY_SIZE(wm8962->supplies), 4174 ret = regulator_bulk_enable(ARRAY_SIZE(wm8962->supplies),
@@ -4241,8 +4242,7 @@ err_enable:
4241 regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); 4242 regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
4242err_get: 4243err_get:
4243 regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); 4244 regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
4244err_alloc: 4245err:
4245 kfree(wm8962);
4246 return ret; 4246 return ret;
4247} 4247}
4248 4248
@@ -4253,7 +4253,6 @@ static __devexit int wm8962_i2c_remove(struct i2c_client *client)
4253 snd_soc_unregister_codec(&client->dev); 4253 snd_soc_unregister_codec(&client->dev);
4254 regmap_exit(wm8962->regmap); 4254 regmap_exit(wm8962->regmap);
4255 regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); 4255 regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
4256 kfree(i2c_get_clientdata(client));
4257 return 0; 4256 return 0;
4258} 4257}
4259 4258