|
@@ -984,7 +984,6 @@ static int wm8985_remove(struct snd_soc_codec *codec)
|
|
|
|
|
|
wm8985 = snd_soc_codec_get_drvdata(codec);
|
|
wm8985 = snd_soc_codec_get_drvdata(codec);
|
|
wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
|
|
wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
|
|
- regulator_bulk_free(ARRAY_SIZE(wm8985->supplies), wm8985->supplies);
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -999,7 +998,7 @@ static int wm8985_probe(struct snd_soc_codec *codec)
|
|
for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++)
|
|
for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++)
|
|
wm8985->supplies[i].supply = wm8985_supply_names[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);
|
|
wm8985->supplies);
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_err(codec->dev, "Failed to request supplies: %d\n", 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);
|
|
wm8985->supplies);
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
|
|
dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
|
|
- goto err_reg_get;
|
|
|
|
|
|
+ return ret;
|
|
}
|
|
}
|
|
|
|
|
|
ret = wm8985_reset(codec);
|
|
ret = wm8985_reset(codec);
|
|
@@ -1032,8 +1031,6 @@ static int wm8985_probe(struct snd_soc_codec *codec)
|
|
|
|
|
|
err_reg_enable:
|
|
err_reg_enable:
|
|
regulator_bulk_disable(ARRAY_SIZE(wm8985->supplies), wm8985->supplies);
|
|
regulator_bulk_disable(ARRAY_SIZE(wm8985->supplies), wm8985->supplies);
|
|
-err_reg_get:
|
|
|
|
- regulator_bulk_free(ARRAY_SIZE(wm8985->supplies), wm8985->supplies);
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|