ASoC: dapm: Add regulator member to struct dapm_widget.
PATCH 1/1 ASoC: dapm: Add regulator member to struct dapm_widget.
Currently DAPM widgets use the private data for their regulator. Add a regulator * for widgets to use instead of private data.
Signed-off-by Liam Girdwood <[email protected]>
--- include/sound/soc-dapm.h | 2 ++ sound/soc/soc-dapm.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-)
include/sound/soc-dapm.h +2 -0
@@ -323,6 +323,7 @@ struct snd_soc_dapm_path;struct snd_soc_dapm_pin ;struct snd_soc_dapm_route ;struct snd_soc_dapm_context ; +struct regulator ;int dapm_reg_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event);
@@ -486,6 +487,7 @@ struct snd_soc_dapm_widget {struct snd_soc_dapm_context *dapm;void *priv;/* widget specific data */ +struct regulator *regulator;/* attached regulator */ /* dapm control */ short reg;/* negative reg = no direct dapm */
sound/soc/soc-dapm.c +5 -5
@@ -883,9 +883,9 @@ int dapm_regulator_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { if (SND_SOC_DAPM_EVENT_ON(event)) - return regulator_enable(w->priv); + return regulator_enable(w->regulator); else - return regulator_disable_deferred(w->priv, w->shift); + return regulator_disable_deferred(w->regulator, w->shift); }EXPORT_SYMBOL_GPL (dapm_regulator_event);
@@ -2790,9 +2790,9 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,switch (w->id) {case snd_soc_dapm_regulator_supply: - w->priv =devm_regulator_get (dapm->dev, w->name); -if (IS_ERR (w->priv)) { - ret =PTR_ERR (w->priv); + w->regulator =devm_regulator_get (dapm->dev, w->name); +if (IS_ERR (w->regulator)) { + ret =PTR_ERR (w->regulator);dev_err (dapm->dev,"Failed to request %s: %d\n" , w->name, ret);return NULL ;
Signature · 1 line
1.7.5.4
Mark Brown
AppliedQuoted 2 lines · Liam Girdwood
Currently DAPM widgets use the private data for their regulator. Add a regulator * for widgets to use instead of private data.
Applied, thanks.