ASoC: wm_adsp: Use SND_SOC_DAPM_PGA_E() instead of open-coding it

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index fea514627526b18e3556a94137967da7371f0ec1..36533eac420ee8fc684fdaf04aa81dbd153fa90d 100644 (file)
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -58,14 +58,12 @@ struct wm_adsp {
 };
 
 #define WM_ADSP1(wname, num) \
-       { .id = snd_soc_dapm_pga, .name = wname, .reg = SND_SOC_NOPM, \
-       .shift = num, .event = wm_adsp1_event, \
-       .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
+       SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, num, 0, NULL, 0, \
+               wm_adsp1_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD)
 
 #define WM_ADSP2(wname, num) \
-{      .id = snd_soc_dapm_pga, .name = wname, .reg = SND_SOC_NOPM, \
-       .shift = num, .event = wm_adsp2_event, \
-       .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
+       SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, num, 0, NULL, 0, \
+               wm_adsp2_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD)
 
 extern const struct snd_kcontrol_new wm_adsp1_fw_controls[];
 extern const struct snd_kcontrol_new wm_adsp2_fw_controls[];