ASoC: Convert wm8770 to devm_kzalloc()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 8 Dec 2011 08:24:16 +0000 (16:24 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 9 Dec 2011 12:36:59 +0000 (20:36 +0800)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8770.c

index ea6f007a81148c5bc4ddb48af52286d8e5c43e90..19374a9e5ba6ce06fc721e768255fcdb1ea2d97b 100644 (file)
@@ -695,7 +695,8 @@ static int __devinit wm8770_spi_probe(struct spi_device *spi)
        struct wm8770_priv *wm8770;
        int ret;
 
-       wm8770 = kzalloc(sizeof(struct wm8770_priv), GFP_KERNEL);
+       wm8770 = devm_kzalloc(&spi->dev, sizeof(struct wm8770_priv),
+                             GFP_KERNEL);
        if (!wm8770)
                return -ENOMEM;
 
@@ -704,15 +705,13 @@ static int __devinit wm8770_spi_probe(struct spi_device *spi)
 
        ret = snd_soc_register_codec(&spi->dev,
                                     &soc_codec_dev_wm8770, &wm8770_dai, 1);
-       if (ret < 0)
-               kfree(wm8770);
+
        return ret;
 }
 
 static int __devexit wm8770_spi_remove(struct spi_device *spi)
 {
        snd_soc_unregister_codec(&spi->dev);
-       kfree(spi_get_drvdata(spi));
        return 0;
 }