struct aic3x_priv *aic3x;
        int ret;
 
-       aic3x = kzalloc(sizeof(struct aic3x_priv), GFP_KERNEL);
+       aic3x = devm_kzalloc(&i2c->dev, sizeof(struct aic3x_priv), GFP_KERNEL);
        if (aic3x == NULL) {
                dev_err(&i2c->dev, "failed to create private data\n");
                return -ENOMEM;
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_aic3x, &aic3x_dai, 1);
-       if (ret < 0)
-               kfree(aic3x);
        return ret;
 }
 
 static int aic3x_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }