ASoC: Convert WM8750 to devm_kzalloc()
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 3 Dec 2011 17:18:37 +0000 (17:18 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 3 Dec 2011 21:35:08 +0000 (21:35 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8750.c

index 48cb78fd0103f66d6b804882fab78754810d29c0..fa5732d78225d7e013823c878623fae7260d1cae 100644 (file)
@@ -744,7 +744,8 @@ static int __devinit wm8750_spi_probe(struct spi_device *spi)
        struct wm8750_priv *wm8750;
        int ret;
 
-       wm8750 = kzalloc(sizeof(struct wm8750_priv), GFP_KERNEL);
+       wm8750 = devm_kzalloc(&spi->dev, sizeof(struct wm8750_priv),
+                             GFP_KERNEL);
        if (wm8750 == NULL)
                return -ENOMEM;
 
@@ -753,15 +754,12 @@ static int __devinit wm8750_spi_probe(struct spi_device *spi)
 
        ret = snd_soc_register_codec(&spi->dev,
                        &soc_codec_dev_wm8750, &wm8750_dai, 1);
-       if (ret < 0)
-               kfree(wm8750);
        return ret;
 }
 
 static int __devexit wm8750_spi_remove(struct spi_device *spi)
 {
        snd_soc_unregister_codec(&spi->dev);
-       kfree(spi_get_drvdata(spi));
        return 0;
 }
 
@@ -791,7 +789,8 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c,
        struct wm8750_priv *wm8750;
        int ret;
 
-       wm8750 = kzalloc(sizeof(struct wm8750_priv), GFP_KERNEL);
+       wm8750 = devm_kzalloc(&i2c->dev, sizeof(struct wm8750_priv),
+                             GFP_KERNEL);
        if (wm8750 == NULL)
                return -ENOMEM;
 
@@ -800,15 +799,12 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c,
 
        ret =  snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8750, &wm8750_dai, 1);
-       if (ret < 0)
-               kfree(wm8750);
        return ret;
 }
 
 static __devexit int wm8750_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }