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>

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 75020f52acdd7b8f4cbc88e0487aa3fec9124521..5932d66fd6544bb6c0136f14681eb3edd11ea3e0 100644 (file)
--- 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,

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d0c61c120ac17773b87b50d4ef5379c5178bd243..98e20de50e2d4b2c978a0d01d94775009f9b3072 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1058,26 +1058,6 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
        return paths;
 }
 
-/*
- * 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.
  */