Commit e9382e3b authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown

ASoC: tlv320dac33: 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
...@@ -1540,7 +1540,7 @@ static int dac33_i2c_probe(struct i2c_client *client, ...@@ -1540,7 +1540,7 @@ static int dac33_i2c_probe(struct i2c_client *client,
for (i = 0; i < ARRAY_SIZE(dac33->supplies); i++) for (i = 0; i < ARRAY_SIZE(dac33->supplies); i++)
dac33->supplies[i].supply = dac33_supply_names[i]; dac33->supplies[i].supply = dac33_supply_names[i];
ret = regulator_bulk_get(&client->dev, ARRAY_SIZE(dac33->supplies), ret = devm_regulator_bulk_get(&client->dev, ARRAY_SIZE(dac33->supplies),
dac33->supplies); dac33->supplies);
if (ret != 0) { if (ret != 0) {
...@@ -1551,11 +1551,9 @@ static int dac33_i2c_probe(struct i2c_client *client, ...@@ -1551,11 +1551,9 @@ static int dac33_i2c_probe(struct i2c_client *client,
ret = snd_soc_register_codec(&client->dev, ret = snd_soc_register_codec(&client->dev,
&soc_codec_dev_tlv320dac33, &dac33_dai, 1); &soc_codec_dev_tlv320dac33, &dac33_dai, 1);
if (ret < 0) if (ret < 0)
goto err_register; goto err_get;
return ret; return ret;
err_register:
regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);
err_get: err_get:
if (dac33->power_gpio >= 0) if (dac33->power_gpio >= 0)
gpio_free(dac33->power_gpio); gpio_free(dac33->power_gpio);
...@@ -1573,8 +1571,6 @@ static int dac33_i2c_remove(struct i2c_client *client) ...@@ -1573,8 +1571,6 @@ static int dac33_i2c_remove(struct i2c_client *client)
if (dac33->power_gpio >= 0) if (dac33->power_gpio >= 0)
gpio_free(dac33->power_gpio); gpio_free(dac33->power_gpio);
regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment