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

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

ASoC: wm8955: 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/wm8955.c

+2 −7
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ static int wm8955_probe(struct snd_soc_codec *codec) 
	for (i = 0; i < ARRAY_SIZE(wm8955->supplies); i++)

		wm8955->supplies[i].supply = wm8955_supply_names[i];



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

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

				 wm8955->supplies);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
@@ -909,7 +909,7 @@ static int wm8955_probe(struct snd_soc_codec *codec) 
				    wm8955->supplies);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);

		goto err_get;

		return ret;

	}



	ret = wm8955_reset(codec);
@@ -961,17 +961,12 @@ static int wm8955_probe(struct snd_soc_codec *codec) 


err_enable:

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

err_get:

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

	return ret;

}



static int wm8955_remove(struct snd_soc_codec *codec)

{

	struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);



	wm8955_set_bias_level(codec, SND_SOC_BIAS_OFF);

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

	return 0;

}