Commit a1fea940 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm8985: Convert to devm_kzalloc() 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 78adaeb2

sound/soc/codecs/wm8985.c

+2 −8
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi) 
	struct wm8985_priv *wm8985;

	int ret;



	wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL);

	wm8985 = devm_kzalloc(&spi->dev, sizeof *wm8985, GFP_KERNEL);

	if (!wm8985)

		return -ENOMEM;
@@ -1088,15 +1088,12 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi) 


	ret = snd_soc_register_codec(&spi->dev,

				     &soc_codec_dev_wm8985, &wm8985_dai, 1);

	if (ret < 0)

		kfree(wm8985);

	return ret;

}



static int __devexit wm8985_spi_remove(struct spi_device *spi)

{

	snd_soc_unregister_codec(&spi->dev);

	kfree(spi_get_drvdata(spi));

	return 0;

}
@@ -1117,7 +1114,7 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c, 
	struct wm8985_priv *wm8985;

	int ret;



	wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL);

	wm8985 = devm_kzalloc(&i2c->dev, sizeof *wm8985, GFP_KERNEL);

	if (!wm8985)

		return -ENOMEM;
@@ -1126,15 +1123,12 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c, 


	ret = snd_soc_register_codec(&i2c->dev,

				     &soc_codec_dev_wm8985, &wm8985_dai, 1);

	if (ret < 0)

		kfree(wm8985);

	return ret;

}



static __devexit int wm8985_i2c_remove(struct i2c_client *client)

{

	snd_soc_unregister_codec(&client->dev);

	kfree(i2c_get_clientdata(client));

	return 0;

}