Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eee5d7f9 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: dapm: Add a helper to get the CODEC for DAPM kcontrol 



We use the same 3 lines to get the CODEC for a kcontrol in a quite a few places.
This patch puts them into a common helper function. Having this encapsulated in
a helper function will also make it more easier to eventually change the data
layout of the kcontrol's private data.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 95dd5cd6

include/sound/soc-dapm.h

+2 −0
Original line number Diff line number Diff line
@@ -427,6 +427,8 @@ void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm); 
int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,

	struct snd_soc_dapm_widget_list **list);



struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol);



/* dapm widget types */

enum snd_soc_dapm_type {

	snd_soc_dapm_input = 0,		/* input pin */

sound/soc/codecs/tlv320aic3x.c

+3 −4
Original line number Diff line number Diff line
@@ -138,8 +138,7 @@ static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = { 
static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,

					struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	unsigned int reg = mc->reg;
@@ -165,14 +164,14 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol, 
	mask <<= shift;

	val <<= shift;



	change = snd_soc_test_bits(widget->codec, val, mask, reg);

	change = snd_soc_test_bits(codec, val, mask, reg);

	if (change) {

		update.kcontrol = kcontrol;

		update.reg = reg;

		update.mask = mask;

		update.val = val;



		snd_soc_dapm_mixer_update_power(widget->dapm, kcontrol, connect,

		snd_soc_dapm_mixer_update_power(&codec->dapm, kcontrol, connect,

			&update);

	}

sound/soc/codecs/twl6040.c

+1 −3
Original line number Diff line number Diff line
@@ -437,9 +437,7 @@ static irqreturn_t twl6040_audio_handler(int irq, void *data) 
static int twl6040_soc_dapm_put_vibra_enum(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_codec *codec = widget->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int val;

sound/soc/codecs/wm8903.c

+1 −3
Original line number Diff line number Diff line
@@ -364,9 +364,7 @@ static void wm8903_seq_notifier(struct snd_soc_dapm_context *dapm, 
static int wm8903_class_w_put(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_codec *codec = widget->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);

	struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);

	u16 reg;

	int ret;

sound/soc/codecs/wm8994.c

+1 −3
Original line number Diff line number Diff line
@@ -1437,9 +1437,7 @@ SOC_DAPM_SINGLE("AIF1.1 Switch", WM8994_DAC2_RIGHT_MIXER_ROUTING, 
static int wm8994_put_class_w(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);

	struct snd_soc_dapm_widget *w = wlist->widgets[0];

	struct snd_soc_codec *codec = w->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);

	int ret;



	ret = snd_soc_dapm_put_volsw(kcontrol, ucontrol);