ASoC: wm8985: 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: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Родитель
c9eaa447e7
Коммит
a0b148b423
|
@ -984,7 +984,6 @@ static int wm8985_remove(struct snd_soc_codec *codec)
|
|||
|
||||
wm8985 = snd_soc_codec_get_drvdata(codec);
|
||||
wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
|
||||
regulator_bulk_free(ARRAY_SIZE(wm8985->supplies), wm8985->supplies);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -999,7 +998,7 @@ static int wm8985_probe(struct snd_soc_codec *codec)
|
|||
for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++)
|
||||
wm8985->supplies[i].supply = wm8985_supply_names[i];
|
||||
|
||||
ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8985->supplies),
|
||||
ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8985->supplies),
|
||||
wm8985->supplies);
|
||||
if (ret) {
|
||||
dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
|
||||
|
@ -1010,7 +1009,7 @@ static int wm8985_probe(struct snd_soc_codec *codec)
|
|||
wm8985->supplies);
|
||||
if (ret) {
|
||||
dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
|
||||
goto err_reg_get;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = wm8985_reset(codec);
|
||||
|
@ -1032,8 +1031,6 @@ static int wm8985_probe(struct snd_soc_codec *codec)
|
|||
|
||||
err_reg_enable:
|
||||
regulator_bulk_disable(ARRAY_SIZE(wm8985->supplies), wm8985->supplies);
|
||||
err_reg_get:
|
||||
regulator_bulk_free(ARRAY_SIZE(wm8985->supplies), wm8985->supplies);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче