ASoC: Convert WM8955 to devm_kzalloc()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 29 Dec 2011 21:23:04 +0000 (21:23 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 20 Jan 2012 13:58:25 +0000 (13:58 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8955.c

index adcfdcaa9fbc64dcf7cf5aa1fe207e7e875e7d50..cc6f6692bf5e1bb189c5898d242b3e32ce7fea83 100644 (file)
@@ -1007,7 +1007,8 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
        struct wm8955_priv *wm8955;
        int ret;
 
-       wm8955 = kzalloc(sizeof(struct wm8955_priv), GFP_KERNEL);
+       wm8955 = devm_kzalloc(&i2c->dev, sizeof(struct wm8955_priv),
+                             GFP_KERNEL);
        if (wm8955 == NULL)
                return -ENOMEM;
 
@@ -1016,15 +1017,13 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8955, &wm8955_dai, 1);
-       if (ret < 0)
-               kfree(wm8955);
+
        return ret;
 }
 
 static __devexit int wm8955_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }