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

Commit f2b1ce49 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: twl4030: Convert to use devm_kzalloc 



Allocate the private data with devm_kzalloc.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d0b3847b

sound/soc/codecs/twl4030.c

+2 −2
Original line number Diff line number Diff line
@@ -2237,7 +2237,8 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec) 
{

	struct twl4030_priv *twl4030;



	twl4030 = kzalloc(sizeof(struct twl4030_priv), GFP_KERNEL);

	twl4030 = devm_kzalloc(codec->dev, sizeof(struct twl4030_priv),

			       GFP_KERNEL);

	if (twl4030 == NULL) {

		dev_err(codec->dev, "Can not allocate memory\n");

		return -ENOMEM;
@@ -2259,7 +2260,6 @@ static int twl4030_soc_remove(struct snd_soc_codec *codec) 
	/* Reset registers to their chip default before leaving */

	twl4030_reset_registers(codec);

	twl4030_set_bias_level(codec, SND_SOC_BIAS_OFF);

	kfree(twl4030);



	if (pdata && pdata->hs_extmute && gpio_is_valid(pdata->hs_extmute_gpio))

		gpio_free(pdata->hs_extmute_gpio);