Skip to content

Commit

Permalink
ASoC: Convert tlv320aic26 to devm_kzalloc()
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Jan 2, 2012
1 parent 0998306 commit a816302
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions sound/soc/codecs/tlv320aic26.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}

Expand Down

0 comments on commit a816302

Please sign in to comment.