ASoC: Convert wm9081 driver to use devm_kzalloc()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 27 Nov 2011 15:57:44 +0000 (15:57 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 27 Nov 2011 16:04:02 +0000 (16:04 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm9081.c

index ba126906f82c65f537c3a10a36b47c9dc0491fb0..8a4b970604444e5140d5017447ee81bdd6036294 100644 (file)
@@ -1361,7 +1361,8 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
        unsigned int reg;
        int ret;
 
-       wm9081 = kzalloc(sizeof(struct wm9081_priv), GFP_KERNEL);
+       wm9081 = devm_kzalloc(&i2c->dev, sizeof(struct wm9081_priv),
+                             GFP_KERNEL);
        if (wm9081 == NULL)
                return -ENOMEM;
 
@@ -1405,7 +1406,6 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
 err_regmap:
        regmap_exit(wm9081->regmap);
 err:
-       kfree(wm9081);
 
        return ret;
 }
@@ -1416,7 +1416,6 @@ static __devexit int wm9081_i2c_remove(struct i2c_client *client)
 
        snd_soc_unregister_codec(&client->dev);
        regmap_exit(wm9081->regmap);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }