diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-04-24 21:27:03 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-25 07:16:03 -0400 |
commit | e9382e3b7a048d4cfc39139caa86b755a74d4da8 (patch) | |
tree | 972aeb61193b3e70b1c152328d7689d5380077d5 /sound/soc/codecs/tlv320dac33.c | |
parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) |
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: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/tlv320dac33.c')
-rw-r--r-- | sound/soc/codecs/tlv320dac33.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index 6bfc8a17331b..0ef856c8dfeb 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c | |||
@@ -1540,7 +1540,7 @@ static int dac33_i2c_probe(struct i2c_client *client, | |||
1540 | for (i = 0; i < ARRAY_SIZE(dac33->supplies); i++) | 1540 | for (i = 0; i < ARRAY_SIZE(dac33->supplies); i++) |
1541 | dac33->supplies[i].supply = dac33_supply_names[i]; | 1541 | dac33->supplies[i].supply = dac33_supply_names[i]; |
1542 | 1542 | ||
1543 | ret = regulator_bulk_get(&client->dev, ARRAY_SIZE(dac33->supplies), | 1543 | ret = devm_regulator_bulk_get(&client->dev, ARRAY_SIZE(dac33->supplies), |
1544 | dac33->supplies); | 1544 | dac33->supplies); |
1545 | 1545 | ||
1546 | if (ret != 0) { | 1546 | if (ret != 0) { |
@@ -1551,11 +1551,9 @@ static int dac33_i2c_probe(struct i2c_client *client, | |||
1551 | ret = snd_soc_register_codec(&client->dev, | 1551 | ret = snd_soc_register_codec(&client->dev, |
1552 | &soc_codec_dev_tlv320dac33, &dac33_dai, 1); | 1552 | &soc_codec_dev_tlv320dac33, &dac33_dai, 1); |
1553 | if (ret < 0) | 1553 | if (ret < 0) |
1554 | goto err_register; | 1554 | goto err_get; |
1555 | 1555 | ||
1556 | return ret; | 1556 | return ret; |
1557 | err_register: | ||
1558 | regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies); | ||
1559 | err_get: | 1557 | err_get: |
1560 | if (dac33->power_gpio >= 0) | 1558 | if (dac33->power_gpio >= 0) |
1561 | gpio_free(dac33->power_gpio); | 1559 | gpio_free(dac33->power_gpio); |
@@ -1573,8 +1571,6 @@ static int dac33_i2c_remove(struct i2c_client *client) | |||
1573 | if (dac33->power_gpio >= 0) | 1571 | if (dac33->power_gpio >= 0) |
1574 | gpio_free(dac33->power_gpio); | 1572 | gpio_free(dac33->power_gpio); |
1575 | 1573 | ||
1576 | regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies); | ||
1577 | |||
1578 | snd_soc_unregister_codec(&client->dev); | 1574 | snd_soc_unregister_codec(&client->dev); |
1579 | return 0; | 1575 | return 0; |
1580 | } | 1576 | } |