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

Commit 2ff49eea authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Convert ak4642 to devm_kzalloc() 



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

sound/soc/codecs/ak4642.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -525,7 +525,8 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c, 
	struct ak4642_priv *ak4642;

	struct ak4642_priv *ak4642;

	int ret;

	int ret;





	ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL);

	ak4642 = devm_kzalloc(&i2c->dev, sizeof(struct ak4642_priv),

			      GFP_KERNEL);

	if (!ak4642)

	if (!ak4642)

		return -ENOMEM;

		return -ENOMEM;
@@ -535,15 +536,12 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c, 
	ret =  snd_soc_register_codec(&i2c->dev,

	ret =  snd_soc_register_codec(&i2c->dev,

				(struct snd_soc_codec_driver *)id->driver_data,

				(struct snd_soc_codec_driver *)id->driver_data,

				&ak4642_dai, 1);

				&ak4642_dai, 1);

	if (ret < 0)

		kfree(ak4642);

	return ret;

	return ret;

}

}





static __devexit int ak4642_i2c_remove(struct i2c_client *client)

static __devexit int ak4642_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;

}

}