1 files changed, 4 insertions, 8 deletions

diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 6bfc8a17331b..df3a7506c023 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -442,7 +442,7 @@ static int dac33_playback_event(struct snd_soc_dapm_widget *w,
 static int dac33_get_fifo_mode(struct snd_kcontrol *kcontrol,
                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = dac33->fifo_mode;
@@ -453,7 +453,7 @@ static int dac33_get_fifo_mode(struct snd_kcontrol *kcontrol,
 static int dac33_set_fifo_mode(struct snd_kcontrol *kcontrol,
                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec);
         int ret = 0;
 
@@ -1540,7 +1540,7 @@ static int dac33_i2c_probe(struct i2c_client *client,
         for (i = 0; i < ARRAY_SIZE(dac33->supplies); 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);
 
         if (ret != 0) {
@@ -1551,11 +1551,9 @@ static int dac33_i2c_probe(struct i2c_client *client,
         ret = snd_soc_register_codec(&client->dev,
                         &soc_codec_dev_tlv320dac33, &dac33_dai, 1);
         if (ret < 0)
-                goto err_register;
+                goto err_get;
 
         return ret;
-err_register:
-        regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);
 err_get:
         if (dac33->power_gpio >= 0)
                 gpio_free(dac33->power_gpio);
@@ -1573,8 +1571,6 @@ static int dac33_i2c_remove(struct i2c_client *client)
         if (dac33->power_gpio >= 0)
                 gpio_free(dac33->power_gpio);
 
-        regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);
-
         snd_soc_unregister_codec(&client->dev);
         return 0;
 }