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

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

ASoC: sta32x: Move resource allocation and release to the corresponding callback functions 



This patch includes below small fixes:

1. Move sta32x_set_bias_level() from sta32x_i2c_remove() to sta32x_remove().
2. Remove a redundant regulator_bulk_free() call in sta32x_i2c_remove(),
   as we will call regulator_bulk_free() in sta32x_remove().
3. Remove unneeded snd_soc_codec_set_drvdata(codec, NULL) in sta32x_i2c_remove.
   The i2c core will set the clientdata to NULL.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Johannes Stezenbach <js@sig21.net>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3f612933

sound/soc/codecs/sta32x.c

+2 −11
Original line number Diff line number Diff line
@@ -812,6 +812,7 @@ static int sta32x_remove(struct snd_soc_codec *codec) 
{

	struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);



	sta32x_set_bias_level(codec, SND_SOC_BIAS_OFF);

	regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);

	regulator_bulk_free(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);
@@ -871,18 +872,8 @@ static __devinit int sta32x_i2c_probe(struct i2c_client *i2c, 
static __devexit int sta32x_i2c_remove(struct i2c_client *client)

{

	struct sta32x_priv *sta32x = i2c_get_clientdata(client);

	struct snd_soc_codec *codec = sta32x->codec;



	if (codec)

		sta32x_set_bias_level(codec, SND_SOC_BIAS_OFF);



	regulator_bulk_free(ARRAY_SIZE(sta32x->supplies), sta32x->supplies);



	if (codec) {

	snd_soc_unregister_codec(&client->dev);

		snd_soc_codec_set_drvdata(codec, NULL);

	}



	kfree(sta32x);

	return 0;

}