Skip to content

Commit c019bba

Browse files
author
Lucas Tanure
committed
ASoC: wm_adsp: Split WM_HALO Preloader
Split WM_HALO Preloader, so other codecs can call only the alsa control creation feature Change-Id: Iaf4e5d8632db979d8e78b804ba11bfdec5fd62fa Signed-off-by: Lucas Tanure <[email protected]>
1 parent 6dc9734 commit c019bba

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

sound/soc/codecs/wm_adsp.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@ struct wm_adsp {
115115
#endif
116116
};
117117

118+
#define WM_ADSP_PRELOADER(wname, num, event_fn) \
119+
{ .id = snd_soc_dapm_supply, .name = wname " Preloader", \
120+
.reg = SND_SOC_NOPM, .shift = num, .event = event_fn, \
121+
.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD, \
122+
.subseq = 100, /* Ensure we run after SYSCLK supply widget */ }
123+
118124
#define WM_ADSP1(wname, num) \
119125
SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, num, 0, NULL, 0, \
120126
wm_adsp1_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD)
@@ -125,20 +131,14 @@ struct wm_adsp {
125131

126132
#define WM_ADSP2(wname, num, event_fn) \
127133
SND_SOC_DAPM_SPK(wname " Preload", NULL), \
128-
{ .id = snd_soc_dapm_supply, .name = wname " Preloader", \
129-
.reg = SND_SOC_NOPM, .shift = num, .event = event_fn, \
130-
.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD, \
131-
.subseq = 100, /* Ensure we run after SYSCLK supply widget */ }, \
134+
WM_ADSP_PRELOADER(wname, num, event_fn), \
132135
{ .id = snd_soc_dapm_out_drv, .name = wname, \
133136
.reg = SND_SOC_NOPM, .shift = num, .event = wm_adsp2_event, \
134137
.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
135138

136139
#define WM_HALO(wname, num, event_fn) \
137140
SND_SOC_DAPM_SPK(wname " Preload", NULL), \
138-
{ .id = snd_soc_dapm_supply, .name = wname " Preloader", \
139-
.reg = SND_SOC_NOPM, .shift = num, .event = event_fn, \
140-
.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD, \
141-
.subseq = 100, /* Ensure we run after SYSCLK supply widget */ }, \
141+
WM_ADSP_PRELOADER(wname, num, event_fn), \
142142
{ .id = snd_soc_dapm_out_drv, .name = wname, \
143143
.reg = SND_SOC_NOPM, .shift = num, .event = wm_halo_event, \
144144
.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }

0 commit comments

Comments
 (0)