Skip to content

Commit

Permalink
ASoC: wm_adsp: Factor out common init code
Browse files Browse the repository at this point in the history
Factor out the duplicated initialization statements from
wm_adsp1_init() and wm_adsp2_init() into new function
wm_adsp_common_init().

The entire content of wm_adsp1_init() is the common code
but it is convenient to retain this exported function
to hide what we currently treat as common init (which might
change in the future) and also make clear the difference
between an ADSP1 entry point and common code.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Richard Fitzgerald authored and Mark Brown committed Nov 13, 2018
1 parent f15c19a commit dcad34f
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions sound/soc/codecs/wm_adsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2416,7 +2416,7 @@ static int wm_adsp_create_name(struct wm_adsp *dsp)
return 0;
}

int wm_adsp1_init(struct wm_adsp *dsp)
static int wm_adsp_common_init(struct wm_adsp *dsp)
{
int ret;

Expand All @@ -2425,11 +2425,17 @@ int wm_adsp1_init(struct wm_adsp *dsp)
return ret;

INIT_LIST_HEAD(&dsp->alg_regions);
INIT_LIST_HEAD(&dsp->ctl_list);

mutex_init(&dsp->pwr_lock);

return 0;
}

int wm_adsp1_init(struct wm_adsp *dsp)
{
return wm_adsp_common_init(dsp);
}
EXPORT_SYMBOL_GPL(wm_adsp1_init);

int wm_adsp1_event(struct snd_soc_dapm_widget *w,
Expand Down Expand Up @@ -2914,7 +2920,7 @@ int wm_adsp2_init(struct wm_adsp *dsp)
{
int ret;

ret = wm_adsp_create_name(dsp);
ret = wm_adsp_common_init(dsp);
if (ret)
return ret;

Expand All @@ -2936,12 +2942,8 @@ int wm_adsp2_init(struct wm_adsp *dsp)
break;
}

INIT_LIST_HEAD(&dsp->alg_regions);
INIT_LIST_HEAD(&dsp->ctl_list);
INIT_WORK(&dsp->boot_work, wm_adsp2_boot_work);

mutex_init(&dsp->pwr_lock);

return 0;
}
EXPORT_SYMBOL_GPL(wm_adsp2_init);
Expand Down

0 comments on commit dcad34f

Please sign in to comment.