diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-11 21:26:25 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-11 21:36:47 -0400 |
commit | 1a9585b0f7b3e21858f9a893d66a845f23d28ef1 (patch) | |
tree | 9020a0cc6bef7454f64783891fdbb5cb59830fbe /sound/soc/codecs/wm8728.c | |
parent | e908ef40e4824a000889b0ab3f9eb9660bbe3f18 (diff) |
ASoC: wm8728: Convert to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8728.c')
-rw-r--r-- | sound/soc/codecs/wm8728.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c index 1467f97dce21..f274c250d492 100644 --- a/sound/soc/codecs/wm8728.c +++ b/sound/soc/codecs/wm8728.c | |||
@@ -280,7 +280,8 @@ static int __devinit wm8728_spi_probe(struct spi_device *spi) | |||
280 | struct wm8728_priv *wm8728; | 280 | struct wm8728_priv *wm8728; |
281 | int ret; | 281 | int ret; |
282 | 282 | ||
283 | wm8728 = kzalloc(sizeof(struct wm8728_priv), GFP_KERNEL); | 283 | wm8728 = devm_kzalloc(&spi->dev, sizeof(struct wm8728_priv), |
284 | GFP_KERNEL); | ||
284 | if (wm8728 == NULL) | 285 | if (wm8728 == NULL) |
285 | return -ENOMEM; | 286 | return -ENOMEM; |
286 | 287 | ||
@@ -289,15 +290,14 @@ static int __devinit wm8728_spi_probe(struct spi_device *spi) | |||
289 | 290 | ||
290 | ret = snd_soc_register_codec(&spi->dev, | 291 | ret = snd_soc_register_codec(&spi->dev, |
291 | &soc_codec_dev_wm8728, &wm8728_dai, 1); | 292 | &soc_codec_dev_wm8728, &wm8728_dai, 1); |
292 | if (ret < 0) | 293 | |
293 | kfree(wm8728); | ||
294 | return ret; | 294 | return ret; |
295 | } | 295 | } |
296 | 296 | ||
297 | static int __devexit wm8728_spi_remove(struct spi_device *spi) | 297 | static int __devexit wm8728_spi_remove(struct spi_device *spi) |
298 | { | 298 | { |
299 | snd_soc_unregister_codec(&spi->dev); | 299 | snd_soc_unregister_codec(&spi->dev); |
300 | kfree(spi_get_drvdata(spi)); | 300 | |
301 | return 0; | 301 | return 0; |
302 | } | 302 | } |
303 | 303 | ||
@@ -319,7 +319,8 @@ static __devinit int wm8728_i2c_probe(struct i2c_client *i2c, | |||
319 | struct wm8728_priv *wm8728; | 319 | struct wm8728_priv *wm8728; |
320 | int ret; | 320 | int ret; |
321 | 321 | ||
322 | wm8728 = kzalloc(sizeof(struct wm8728_priv), GFP_KERNEL); | 322 | wm8728 = devm_kzalloc(&i2c->dev, sizeof(struct wm8728_priv), |
323 | GFP_KERNEL); | ||
323 | if (wm8728 == NULL) | 324 | if (wm8728 == NULL) |
324 | return -ENOMEM; | 325 | return -ENOMEM; |
325 | 326 | ||
@@ -328,15 +329,13 @@ static __devinit int wm8728_i2c_probe(struct i2c_client *i2c, | |||
328 | 329 | ||
329 | ret = snd_soc_register_codec(&i2c->dev, | 330 | ret = snd_soc_register_codec(&i2c->dev, |
330 | &soc_codec_dev_wm8728, &wm8728_dai, 1); | 331 | &soc_codec_dev_wm8728, &wm8728_dai, 1); |
331 | if (ret < 0) | 332 | |
332 | kfree(wm8728); | ||
333 | return ret; | 333 | return ret; |
334 | } | 334 | } |
335 | 335 | ||
336 | static __devexit int wm8728_i2c_remove(struct i2c_client *client) | 336 | static __devexit int wm8728_i2c_remove(struct i2c_client *client) |
337 | { | 337 | { |
338 | snd_soc_unregister_codec(&client->dev); | 338 | snd_soc_unregister_codec(&client->dev); |
339 | kfree(i2c_get_clientdata(client)); | ||
340 | return 0; | 339 | return 0; |
341 | } | 340 | } |
342 | 341 | ||