Merge remote-tracking branches 'asoc/topic/adau' and 'asoc/topic/adsp' into asoc...

[karo-tx-linux.git] / sound / soc / codecs / wm_adsp.c

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index bb5f7b4e3ebbfe016146343c9c1178f568c93517..060027182dcb0bcd57a87600d987d294cab06847 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -242,7 +242,7 @@ struct wm_coeff_ctl {
 static int wm_adsp_fw_get(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 soc_enum *e = (struct soc_enum *)kcontrol->private_value;
        struct wm_adsp *adsp = snd_soc_codec_get_drvdata(codec);
 
@@ -254,7 +254,7 @@ static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol,
 static int wm_adsp_fw_put(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 soc_enum *e = (struct soc_enum *)kcontrol->private_value;
        struct wm_adsp *adsp = snd_soc_codec_get_drvdata(codec);
 
@@ -1543,16 +1543,16 @@ static void wm_adsp2_boot_work(struct work_struct *work)
                ret = regmap_read(dsp->regmap,
                                  dsp->base + ADSP2_CLOCKING, &val);
                if (ret != 0) {
-                       dev_err(dsp->dev, "Failed to read clocking: %d\n", ret);
+                       adsp_err(dsp, "Failed to read clocking: %d\n", ret);
                        return;
                }
 
                if ((val & ADSP2_CLK_SEL_MASK) >= 3) {
                        ret = regulator_enable(dsp->dvfs);
                        if (ret != 0) {
-                               dev_err(dsp->dev,
-                                       "Failed to enable supply: %d\n",
-                                       ret);
+                               adsp_err(dsp,
+                                        "Failed to enable supply: %d\n",
+                                        ret);
                                return;
                        }
 
@@ -1560,9 +1560,9 @@ static void wm_adsp2_boot_work(struct work_struct *work)
                                                    1800000,
                                                    1800000);
                        if (ret != 0) {
-                               dev_err(dsp->dev,
-                                       "Failed to raise supply: %d\n",
-                                       ret);
+                               adsp_err(dsp,
+                                        "Failed to raise supply: %d\n",
+                                        ret);
                                return;
                        }
                }
@@ -1625,7 +1625,7 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
                break;
        default:
                break;
-       };
+       }
 
        return 0;
 }
@@ -1672,15 +1672,15 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
                        ret = regulator_set_voltage(dsp->dvfs, 1200000,
                                                    1800000);
                        if (ret != 0)
-                               dev_warn(dsp->dev,
-                                        "Failed to lower supply: %d\n",
-                                        ret);
+                               adsp_warn(dsp,
+                                         "Failed to lower supply: %d\n",
+                                         ret);
 
                        ret = regulator_disable(dsp->dvfs);
                        if (ret != 0)
-                               dev_err(dsp->dev,
-                                       "Failed to enable supply: %d\n",
-                                       ret);
+                               adsp_err(dsp,
+                                        "Failed to enable supply: %d\n",
+                                        ret);
                }
 
                list_for_each_entry(ctl, &dsp->ctl_list, list)
@@ -1732,28 +1732,25 @@ int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs)
                adsp->dvfs = devm_regulator_get(adsp->dev, "DCVDD");
                if (IS_ERR(adsp->dvfs)) {
                        ret = PTR_ERR(adsp->dvfs);
-                       dev_err(adsp->dev, "Failed to get DCVDD: %d\n", ret);
+                       adsp_err(adsp, "Failed to get DCVDD: %d\n", ret);
                        return ret;
                }
 
                ret = regulator_enable(adsp->dvfs);
                if (ret != 0) {
-                       dev_err(adsp->dev, "Failed to enable DCVDD: %d\n",
-                               ret);
+                       adsp_err(adsp, "Failed to enable DCVDD: %d\n", ret);
                        return ret;
                }
 
                ret = regulator_set_voltage(adsp->dvfs, 1200000, 1800000);
                if (ret != 0) {
-                       dev_err(adsp->dev, "Failed to initialise DVFS: %d\n",
-                               ret);
+                       adsp_err(adsp, "Failed to initialise DVFS: %d\n", ret);
                        return ret;
                }
 
                ret = regulator_disable(adsp->dvfs);
                if (ret != 0) {
-                       dev_err(adsp->dev, "Failed to disable DCVDD: %d\n",
-                               ret);
+                       adsp_err(adsp, "Failed to disable DCVDD: %d\n", ret);
                        return ret;
                }
        }