ASoC: Convert WM8962 to devm_kzalloc()
Subsystems (3)
PATCH 1/1 ASoC: Convert WM8962 to devm_kzalloc()
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8962.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
sound/soc/codecs/wm8962.c +4 -5
@@ -4182,7 +4182,8 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,unsigned int reg;int ret, i; - wm8962 =kzalloc (sizeof (struct wm8962_priv ),GFP_KERNEL ); + wm8962 =devm_kzalloc (&i2c->dev,sizeof (struct wm8962_priv ), +GFP_KERNEL );if (wm8962 ==NULL )return -ENOMEM ;
@@ -4199,7 +4200,7 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c, wm8962->supplies);if (ret !=0 ) {dev_err (&i2c->dev,"Failed to request supplies: %d\n" , ret); - goto err_alloc; + goto err; } ret = regulator_bulk_enable(ARRAY_SIZE(wm8962->supplies),
@@ -4273,8 +4274,7 @@ err_enable:regulator_bulk_disable (ARRAY_SIZE (wm8962->supplies), wm8962->supplies); err_get:regulator_bulk_free (ARRAY_SIZE (wm8962->supplies), wm8962->supplies); -err_alloc: -kfree (wm8962); +err:return ret; }
@@ -4285,7 +4285,6 @@ static __devexit int wm8962_i2c_remove(struct i2c_client *client)snd_soc_unregister_codec (&client->dev);regmap_exit (wm8962->regmap);regulator_bulk_free (ARRAY_SIZE (wm8962->supplies), wm8962->supplies); -kfree (i2c_get_clientdata (client));return 0 ; }
Signature · 1 line
1.7.7.3