Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5ff3c8a authored by Tushar Behera's avatar Tushar Behera Committed by Mark Brown
Browse files

ASoC: wm8995: Convert to use devm_kzalloc() 



Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f4a75d2e

sound/soc/codecs/wm8995.c

+4 −10
Original line number Diff line number Diff line
@@ -2261,7 +2261,7 @@ static int __devinit wm8995_spi_probe(struct spi_device *spi) 
	struct wm8995_priv *wm8995;

	int ret;



	wm8995 = kzalloc(sizeof *wm8995, GFP_KERNEL);

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

	if (!wm8995)

		return -ENOMEM;
@@ -2271,7 +2271,7 @@ static int __devinit wm8995_spi_probe(struct spi_device *spi) 
	if (IS_ERR(wm8995->regmap)) {

		ret = PTR_ERR(wm8995->regmap);

		dev_err(&spi->dev, "Failed to register regmap: %d\n", ret);

		goto err_alloc;

		return ret;

	}



	ret = snd_soc_register_codec(&spi->dev,
@@ -2284,8 +2284,6 @@ static int __devinit wm8995_spi_probe(struct spi_device *spi) 


err_regmap:

	regmap_exit(wm8995->regmap);

err_alloc:

	kfree(wm8995);



	return ret;

}
@@ -2295,7 +2293,6 @@ static int __devexit wm8995_spi_remove(struct spi_device *spi) 
	struct wm8995_priv *wm8995 = spi_get_drvdata(spi);

	snd_soc_unregister_codec(&spi->dev);

	regmap_exit(wm8995->regmap);

	kfree(wm8995);

	return 0;

}
@@ -2316,7 +2313,7 @@ static __devinit int wm8995_i2c_probe(struct i2c_client *i2c, 
	struct wm8995_priv *wm8995;

	int ret;



	wm8995 = kzalloc(sizeof *wm8995, GFP_KERNEL);

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

	if (!wm8995)

		return -ENOMEM;
@@ -2326,7 +2323,7 @@ static __devinit int wm8995_i2c_probe(struct i2c_client *i2c, 
	if (IS_ERR(wm8995->regmap)) {

		ret = PTR_ERR(wm8995->regmap);

		dev_err(&i2c->dev, "Failed to register regmap: %d\n", ret);

		goto err_alloc;

		return ret;

	}



	ret = snd_soc_register_codec(&i2c->dev,
@@ -2341,8 +2338,6 @@ static __devinit int wm8995_i2c_probe(struct i2c_client *i2c, 


err_regmap:

	regmap_exit(wm8995->regmap);

err_alloc:

	kfree(wm8995);



	return ret;

}
@@ -2353,7 +2348,6 @@ static __devexit int wm8995_i2c_remove(struct i2c_client *client) 


	snd_soc_unregister_codec(&client->dev);

	regmap_exit(wm8995->regmap);

	kfree(wm8995);

	return 0;

}