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

Commit 5b48a5a6 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Convert ak4671 to devm_kzalloc() 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 2ff49eea

sound/soc/codecs/ak4671.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -661,7 +661,8 @@ static int __devinit ak4671_i2c_probe(struct i2c_client *client, 
	struct ak4671_priv *ak4671;

	struct ak4671_priv *ak4671;

	int ret;

	int ret;





	ak4671 = kzalloc(sizeof(struct ak4671_priv), GFP_KERNEL);

	ak4671 = devm_kzalloc(&client->dev, sizeof(struct ak4671_priv),

			      GFP_KERNEL);

	if (ak4671 == NULL)

	if (ak4671 == NULL)

		return -ENOMEM;

		return -ENOMEM;
@@ -670,15 +671,12 @@ static int __devinit ak4671_i2c_probe(struct i2c_client *client, 




	ret = snd_soc_register_codec(&client->dev,

	ret = snd_soc_register_codec(&client->dev,

			&soc_codec_dev_ak4671, &ak4671_dai, 1);

			&soc_codec_dev_ak4671, &ak4671_dai, 1);

	if (ret < 0)

		kfree(ak4671);

	return ret;

	return ret;

}

}





static __devexit int ak4671_i2c_remove(struct i2c_client *client)

static __devexit int ak4671_i2c_remove(struct i2c_client *client)

{

{

	snd_soc_unregister_codec(&client->dev);

	snd_soc_unregister_codec(&client->dev);

	kfree(i2c_get_clientdata(client));

	return 0;

	return 0;

}

}