Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62c35b3b authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm_adsp: Use adsp_err/warn instead of dev_err/warn



We have defines for adsp messages best to consistently use them.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent cab27258
Loading
Loading
Loading
Loading
+17 −20
Original line number Diff line number Diff line
@@ -1543,14 +1543,14 @@ 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,
				adsp_err(dsp,
					 "Failed to enable supply: %d\n",
					 ret);
				return;
@@ -1560,7 +1560,7 @@ static void wm_adsp2_boot_work(struct work_struct *work)
						    1800000,
						    1800000);
			if (ret != 0) {
				dev_err(dsp->dev,
				adsp_err(dsp,
					 "Failed to raise supply: %d\n",
					 ret);
				return;
@@ -1672,13 +1672,13 @@ 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,
				adsp_warn(dsp,
					  "Failed to lower supply: %d\n",
					  ret);

			ret = regulator_disable(dsp->dvfs);
			if (ret != 0)
				dev_err(dsp->dev,
				adsp_err(dsp,
					 "Failed to enable supply: %d\n",
					 ret);
		}
@@ -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;
		}
	}