diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-22 00:23:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-22 00:23:42 +0100 |
| commit | 6bf88ab2ecf2f3d25ee25fb4946e4487c4ffd612 (patch) | |
| tree | 6a928bad67f32ff8d979a4ea38f64706e3471631 /include/sound | |
| parent | 1450da3cf682354aff78a757bba559f3150267d6 (diff) | |
| parent | 94986198f5e1f949b2b78373b8a4da803cdcc7f3 (diff) | |
| download | op-kernel-dev-6bf88ab2ecf2f3d25ee25fb4946e4487c4ffd612.zip op-kernel-dev-6bf88ab2ecf2f3d25ee25fb4946e4487c4ffd612.tar.gz | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 75020f5..5932d66 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -256,9 +256,8 @@ struct device; /* generic widgets */ #define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_val) \ { .id = wid, .name = wname, .kcontrol_news = NULL, .num_kcontrols = 0, \ - .reg = -((wreg) + 1), .shift = wshift, .mask = wmask, \ - .on_val = won_val, .off_val = woff_val, .event = dapm_reg_event, \ - .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD} + .reg = wreg, .shift = wshift, .mask = wmask, \ + .on_val = won_val, .off_val = woff_val, } #define SND_SOC_DAPM_SUPPLY(wname, wreg, wshift, winvert, wevent, wflags) \ { .id = snd_soc_dapm_supply, .name = wname, \ SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ @@ -362,8 +361,6 @@ struct regulator; struct snd_soc_dapm_widget_list; struct snd_soc_dapm_update; -int dapm_reg_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event); int dapm_regulator_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event); int dapm_clock_event(struct snd_soc_dapm_widget *w, |
