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

Commit 7d00cd97 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm_adsp: Fixup some odd line wrapping 



Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cc815c4b

sound/soc/codecs/wm_adsp.c

+7 −16
Original line number Diff line number Diff line
@@ -862,15 +862,13 @@ static int wmfw_add_ctl(struct wm_adsp *dsp, struct wm_coeff_ctl *ctl) 
		kcontrol->access |= SNDRV_CTL_ELEM_ACCESS_VOLATILE;

	}



	ret = snd_soc_add_card_controls(dsp->card,

					kcontrol, 1);

	ret = snd_soc_add_card_controls(dsp->card, kcontrol, 1);

	if (ret < 0)

		goto err_kcontrol;



	kfree(kcontrol);



	ctl->kcontrol = snd_soc_card_get_kcontrol(dsp->card,

						  ctl->name);

	ctl->kcontrol = snd_soc_card_get_kcontrol(dsp->card, ctl->name);



	return 0;
@@ -890,9 +888,7 @@ static int wm_coeff_init_control_caches(struct wm_adsp *dsp) 
		if (ctl->flags & WMFW_CTL_FLAG_VOLATILE)

			continue;



		ret = wm_coeff_read_control(ctl,

					    ctl->cache,

					    ctl->len);

		ret = wm_coeff_read_control(ctl, ctl->cache, ctl->len);

		if (ret < 0)

			return ret;

	}
@@ -909,9 +905,7 @@ static int wm_coeff_sync_controls(struct wm_adsp *dsp) 
		if (!ctl->enabled)

			continue;

		if (ctl->set && !(ctl->flags & WMFW_CTL_FLAG_VOLATILE)) {

			ret = wm_coeff_write_control(ctl,

						     ctl->cache,

						     ctl->len);

			ret = wm_coeff_write_control(ctl, ctl->cache, ctl->len);

			if (ret < 0)

				return ret;

		}
@@ -1507,8 +1501,7 @@ static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs, 


	ret = regmap_raw_read(dsp->regmap, pos, alg, len * 2);

	if (ret != 0) {

		adsp_err(dsp, "Failed to read algorithm list: %d\n",

			ret);

		adsp_err(dsp, "Failed to read algorithm list: %d\n", ret);

		kfree(alg);

		return ERR_PTR(ret);

	}
@@ -2007,8 +2000,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, 
				goto err_mutex;

			}



			val = (val & dsp->sysclk_mask)

				>> dsp->sysclk_shift;

			val = (val & dsp->sysclk_mask) >> dsp->sysclk_shift;



			ret = regmap_update_bits(dsp->regmap,

						 dsp->base + ADSP1_CONTROL_31,
@@ -2101,8 +2093,7 @@ static int wm_adsp2_ena(struct wm_adsp *dsp) 


	/* Wait for the RAM to start, should be near instantaneous */

	for (count = 0; count < 10; ++count) {

		ret = regmap_read(dsp->regmap, dsp->base + ADSP2_STATUS1,

				  &val);

		ret = regmap_read(dsp->regmap, dsp->base + ADSP2_STATUS1, &val);

		if (ret != 0)

			return ret;