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

Commit 6b207c0f authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: twl4030: Clean up duplicated code 



Remove the open code in snd_soc_put_twl4030_opmode_enum_double() but
just call snd_soc_put_enum_double() instead, which does the very same
thing (even correctly with a lock).

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 9a8d38db

sound/soc/codecs/twl4030.c

+1 −16
Original line number Diff line number Diff line
@@ -965,9 +965,6 @@ static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);

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

	unsigned short val;

	unsigned short mask;



	if (twl4030->configured) {

		dev_err(codec->dev,
@@ -975,19 +972,7 @@ static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol, 
		return -EBUSY;

	}



	if (ucontrol->value.enumerated.item[0] >= e->items)

		return -EINVAL;



	val = ucontrol->value.enumerated.item[0] << e->shift_l;

	mask = e->mask << e->shift_l;

	if (e->shift_l != e->shift_r) {

		if (ucontrol->value.enumerated.item[1] >= e->items)

			return -EINVAL;

		val |= ucontrol->value.enumerated.item[1] << e->shift_r;

		mask |= e->mask << e->shift_r;

	}



	return snd_soc_update_bits(codec, e->reg, mask, val);

	return snd_soc_put_enum_double(kcontrol, ucontrol);

}



/*