]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ASoC: Convert 88pm860x-codec to devm_kzalloc()
authorAxel Lin <axel.lin@gmail.com>
Mon, 26 Dec 2011 12:48:48 +0000 (20:48 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 27 Dec 2011 12:58:02 +0000 (12:58 +0000)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/88pm860x-codec.c

index 99ca53c01676a0f1f341453c1b87939132eda495..9fd3b6827bba91c6717fdd9a006cf8612ce81d18 100644 (file)
@@ -1430,7 +1430,8 @@ static int __devinit pm860x_codec_probe(struct platform_device *pdev)
        struct resource *res;
        int i, ret;
 
-       pm860x = kzalloc(sizeof(struct pm860x_priv), GFP_KERNEL);
+       pm860x = devm_kzalloc(&pdev->dev, sizeof(struct pm860x_priv),
+                             GFP_KERNEL);
        if (pm860x == NULL)
                return -ENOMEM;
 
@@ -1459,17 +1460,13 @@ static int __devinit pm860x_codec_probe(struct platform_device *pdev)
 
 out:
        platform_set_drvdata(pdev, NULL);
-       kfree(pm860x);
        return -EINVAL;
 }
 
 static int __devexit pm860x_codec_remove(struct platform_device *pdev)
 {
-       struct pm860x_priv *pm860x = platform_get_drvdata(pdev);
-
        snd_soc_unregister_codec(&pdev->dev);
        platform_set_drvdata(pdev, NULL);
-       kfree(pm860x);
        return 0;
 }