ASoC: wm8510: Convert to devm_kzalloc()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 12 Sep 2012 01:24:12 +0000 (09:24 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 12 Sep 2012 01:36:43 +0000 (09:36 +0800)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8510.c

index 56a049555e2c1de782b82b2fc7e947539076c1a3..98f28a006faf209ecf8abcd23618bb582878a58b 100644 (file)
@@ -592,7 +592,8 @@ static int __devinit wm8510_spi_probe(struct spi_device *spi)
        struct wm8510_priv *wm8510;
        int ret;
 
-       wm8510 = kzalloc(sizeof(struct wm8510_priv), GFP_KERNEL);
+       wm8510 = devm_kzalloc(&spi->dev, sizeof(struct wm8510_priv),
+                             GFP_KERNEL);
        if (wm8510 == NULL)
                return -ENOMEM;
 
@@ -601,8 +602,7 @@ static int __devinit wm8510_spi_probe(struct spi_device *spi)
 
        ret = snd_soc_register_codec(&spi->dev,
                        &soc_codec_dev_wm8510, &wm8510_dai, 1);
-       if (ret < 0)
-               kfree(wm8510);
+
        return ret;
 }
 
@@ -630,7 +630,8 @@ static __devinit int wm8510_i2c_probe(struct i2c_client *i2c,
        struct wm8510_priv *wm8510;
        int ret;
 
-       wm8510 = kzalloc(sizeof(struct wm8510_priv), GFP_KERNEL);
+       wm8510 = devm_kzalloc(&i2c->dev, sizeof(struct wm8510_priv),
+                             GFP_KERNEL);
        if (wm8510 == NULL)
                return -ENOMEM;
 
@@ -639,8 +640,7 @@ static __devinit int wm8510_i2c_probe(struct i2c_client *i2c,
 
        ret =  snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8510, &wm8510_dai, 1);
-       if (ret < 0)
-               kfree(wm8510);
+
        return ret;
 }