Commit 56574d54 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: wm_adsp: factor out freeing of alg regions 



Add a function to delete and free the contents of the alg_regions list.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 401cf146

sound/soc/codecs/wm_adsp.c

+16 −16
Original line number Diff line number Diff line
@@ -1571,6 +1571,19 @@ static struct wm_adsp_alg_region *wm_adsp_create_region(struct wm_adsp *dsp, 
	return alg_region;

}



static void wm_adsp_free_alg_regions(struct wm_adsp *dsp)

{

	struct wm_adsp_alg_region *alg_region;



	while (!list_empty(&dsp->alg_regions)) {

		alg_region = list_first_entry(&dsp->alg_regions,

					      struct wm_adsp_alg_region,

					      list);

		list_del(&alg_region->list);

		kfree(alg_region);

	}

}



static int wm_adsp1_setup_algs(struct wm_adsp *dsp)

{

	struct wmfw_adsp1_id_hdr adsp1_id;
@@ -2001,7 +2014,6 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, 
	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);

	struct wm_adsp *dsp = &dsps[w->shift];

	struct wm_adsp_alg_region *alg_region;

	struct wm_coeff_ctl *ctl;

	int ret;

	unsigned int val;
@@ -2081,13 +2093,8 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, 
		list_for_each_entry(ctl, &dsp->ctl_list, list)

			ctl->enabled = 0;



		while (!list_empty(&dsp->alg_regions)) {

			alg_region = list_first_entry(&dsp->alg_regions,

						      struct wm_adsp_alg_region,

						      list);

			list_del(&alg_region->list);

			kfree(alg_region);

		}



		wm_adsp_free_alg_regions(dsp);

		break;



	default:
@@ -2229,7 +2236,6 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, 
	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);

	struct wm_adsp *dsp = &dsps[w->shift];

	struct wm_adsp_alg_region *alg_region;

	struct wm_coeff_ctl *ctl;

	int ret;
@@ -2276,13 +2282,7 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, 
		list_for_each_entry(ctl, &dsp->ctl_list, list)

			ctl->enabled = 0;



		while (!list_empty(&dsp->alg_regions)) {

			alg_region = list_first_entry(&dsp->alg_regions,

						      struct wm_adsp_alg_region,

						      list);

			list_del(&alg_region->list);

			kfree(alg_region);

		}

		wm_adsp_free_alg_regions(dsp);



		if (wm_adsp_fw[dsp->fw].num_caps != 0)

			wm_adsp_buffer_free(dsp);