Skip to content

Commit

Permalink
ASoC: wm8737: 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 12, 2012
1 parent 1a9585b commit 65fdd9b
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions sound/soc/codecs/wm8737.c
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,8 @@ static __devinit int wm8737_i2c_probe(struct i2c_client *i2c,
struct wm8737_priv *wm8737;
int ret;

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

Expand All @@ -656,16 +657,15 @@ static __devinit int wm8737_i2c_probe(struct i2c_client *i2c,

ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8737, &wm8737_dai, 1);
if (ret < 0)
kfree(wm8737);

return ret;

}

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

return 0;
}

Expand Down Expand Up @@ -693,7 +693,8 @@ static int __devinit wm8737_spi_probe(struct spi_device *spi)
struct wm8737_priv *wm8737;
int ret;

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

Expand All @@ -702,15 +703,14 @@ static int __devinit wm8737_spi_probe(struct spi_device *spi)

ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm8737, &wm8737_dai, 1);
if (ret < 0)
kfree(wm8737);

return ret;
}

static int __devexit wm8737_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 65fdd9b

Please sign in to comment.