ASoC: Convert WM8962 register access map to modern style

[deliverable/linux.git] / sound / soc / codecs / tlv320aic26.c

diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 86d1fa38ed2e7d8afcf0d19f8eb8786232505c8e..a038daec682bfba9dd6997b9acfbb4e0c4855ca2 100644 (file)
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -416,7 +416,7 @@ static int aic26_spi_probe(struct spi_device *spi)
        dev_dbg(&spi->dev, "probing tlv320aic26 spi device\n");
 
        /* Allocate driver data */
-       aic26 = kzalloc(sizeof *aic26, GFP_KERNEL);
+       aic26 = devm_kzalloc(&spi->dev, sizeof *aic26, GFP_KERNEL);
        if (!aic26)
                return -ENOMEM;
 
@@ -427,18 +427,12 @@ static int aic26_spi_probe(struct spi_device *spi)
 
        ret = snd_soc_register_codec(&spi->dev,
                        &aic26_soc_codec_dev, &aic26_dai, 1);
-       if (ret < 0)
-               kfree(aic26);
        return ret;
-
-       dev_dbg(&spi->dev, "SPI device initialized\n");
-       return 0;
 }
 
 static int aic26_spi_remove(struct spi_device *spi)
 {
        snd_soc_unregister_codec(&spi->dev);
-       kfree(spi_get_drvdata(spi));
        return 0;
 }