Skip to content

Commit

Permalink
ASoC: Convert wm8804 to devm_kzalloc()
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Jan 20, 2012
1 parent e055cd6 commit f649f1a
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions sound/soc/codecs/wm8804.c
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi)
struct wm8804_priv *wm8804;
int ret;

wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL);
wm8804 = devm_kzalloc(&spi->dev, sizeof *wm8804, GFP_KERNEL);
if (!wm8804)
return -ENOMEM;

Expand All @@ -722,15 +722,13 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi)

ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm8804, &wm8804_dai, 1);
if (ret < 0)
kfree(wm8804);

return ret;
}

static int __devexit wm8804_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
kfree(spi_get_drvdata(spi));
return 0;
}

Expand All @@ -752,7 +750,7 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c,
struct wm8804_priv *wm8804;
int ret;

wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL);
wm8804 = devm_kzalloc(&i2c->dev, sizeof *wm8804, GFP_KERNEL);
if (!wm8804)
return -ENOMEM;

Expand All @@ -761,15 +759,14 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c,

ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8804, &wm8804_dai, 1);
if (ret < 0)
kfree(wm8804);

return ret;
}

static __devexit int wm8804_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
kfree(i2c_get_clientdata(client));

return 0;
}

Expand Down

0 comments on commit f649f1a

Please sign in to comment.