Skip to content

Commit

Permalink
ASoC: wm8900: Convert 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 Sep 11, 2012
1 parent dbad34e commit 6a58870
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions sound/soc/codecs/wm8900.c
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,8 @@ static int __devinit wm8900_spi_probe(struct spi_device *spi)
struct wm8900_priv *wm8900;
int ret;

wm8900 = kzalloc(sizeof(struct wm8900_priv), GFP_KERNEL);
wm8900 = devm_kzalloc(&spi->dev, sizeof(struct wm8900_priv),
GFP_KERNEL);
if (wm8900 == NULL)
return -ENOMEM;

Expand All @@ -1235,15 +1236,13 @@ static int __devinit wm8900_spi_probe(struct spi_device *spi)

ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm8900, &wm8900_dai, 1);
if (ret < 0)
kfree(wm8900);

return ret;
}

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

Expand All @@ -1264,7 +1263,8 @@ static __devinit int wm8900_i2c_probe(struct i2c_client *i2c,
struct wm8900_priv *wm8900;
int ret;

wm8900 = kzalloc(sizeof(struct wm8900_priv), GFP_KERNEL);
wm8900 = devm_kzalloc(&i2c->dev, sizeof(struct wm8900_priv),
GFP_KERNEL);
if (wm8900 == NULL)
return -ENOMEM;

Expand All @@ -1273,15 +1273,13 @@ static __devinit int wm8900_i2c_probe(struct i2c_client *i2c,

ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8900, &wm8900_dai, 1);
if (ret < 0)
kfree(wm8900);

return ret;
}

static __devexit int wm8900_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 6a58870

Please sign in to comment.