diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-05-11 19:27:47 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-12 22:48:08 +0200 |
| commit | 94986198f5e1f949b2b78373b8a4da803cdcc7f3 (patch) | |
| tree | 5b6cd955dc8670bd7f43d90491541d17771929ca /sound/soc/soc-dapm.c | |
| parent | ASoC: dapm: Simplify snd_soc_dapm_link_dai_widgets() (diff) | |
| download | linux-94986198f5e1f949b2b78373b8a4da803cdcc7f3.tar.xz linux-94986198f5e1f949b2b78373b8a4da803cdcc7f3.zip | |
ASoC: dapm: Handle SND_SOC_DAPM_REG() generically
Commit commit de9ba98b6d ("ASoC: dapm: Make widget power register settings more
flexible") added generic support for on_val/off_val in the DAPM core. With this
in place there is no need anymore for having a special event callback for
SND_SOC_DAPM_REG() widgets.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d0c61c120ac1..98e20de50e2d 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1059,26 +1059,6 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, } /* - * Handler for generic register modifier widget. - */ -int dapm_reg_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) -{ - unsigned int val; - - if (SND_SOC_DAPM_EVENT_ON(event)) - val = w->on_val; - else - val = w->off_val; - - soc_widget_update_bits(w, -(w->reg + 1), - w->mask << w->shift, val << w->shift); - - return 0; -} -EXPORT_SYMBOL_GPL(dapm_reg_event); - -/* * Handler for regulator supply widget. */ int dapm_regulator_event(struct snd_soc_dapm_widget *w, |