ASoC: Convert WM8962 register access map to modern style

[deliverable/linux.git] / sound / soc / codecs / ak4642.c

diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 9b4ee6c63d28c948eae4509edfc772e994ff786b..5ef70b5d27e4eae85f6e4e1a1c310ea273e0eb60 100644 (file)
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -525,7 +525,8 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
        struct ak4642_priv *ak4642;
        int ret;
 
-       ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL);
+       ak4642 = devm_kzalloc(&i2c->dev, sizeof(struct ak4642_priv),
+                             GFP_KERNEL);
        if (!ak4642)
                return -ENOMEM;
 
@@ -535,15 +536,12 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
        ret =  snd_soc_register_codec(&i2c->dev,
                                (struct snd_soc_codec_driver *)id->driver_data,
                                &ak4642_dai, 1);
-       if (ret < 0)
-               kfree(ak4642);
        return ret;
 }
 
 static __devexit int ak4642_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }