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

Commit 63e54cd9 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

ASoC: sgtl5000: Use devm_regulator_bulk_get() 



Using devm_regulator_bulk_get() can make the code cleaner and smaller as we
do not need to call regulator_bulk_free() in the error and remove paths.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent c9eaa447

sound/soc/codecs/sgtl5000.c

+2 −9
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec) 
			return ret;

	}



	ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies),

	ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies),

				 sgtl5000->supplies);

	if (ret)

		goto err_ldo_remove;
@@ -1330,16 +1330,13 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec) 
	ret = regulator_bulk_enable(ARRAY_SIZE(sgtl5000->supplies),

					sgtl5000->supplies);

	if (ret)

		goto err_regulator_free;

		goto err_ldo_remove;



	/* wait for all power rails bring up */

	udelay(10);



	return 0;



err_regulator_free:

	regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies),

				sgtl5000->supplies);

err_ldo_remove:

	if (!external_vddd)

		ldo_regulator_remove(codec);
@@ -1409,8 +1406,6 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) 
err:

	regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies),

						sgtl5000->supplies);

	regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies),

				sgtl5000->supplies);

	ldo_regulator_remove(codec);



	return ret;
@@ -1424,8 +1419,6 @@ static int sgtl5000_remove(struct snd_soc_codec *codec) 


	regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies),

						sgtl5000->supplies);

	regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies),

				sgtl5000->supplies);

	ldo_regulator_remove(codec);



	return 0;