Commit 9f061718 authored May 11, 2015 by Lars-Peter Clausen Committed by Mark Brown May 11, 2015

ASoC: uda1380: Replace direct snd_soc_codec dapm field access



The dapm field of the snd_soc_codec struct is eventually going to be
removed, in preparation for this replace all manual access to
codec->dapm.bias_level with snd_soc_codec_get_bias_level().

Also drop the unnecessary check at the beginning of the
uda1380_set_bias_level() which compares the current level to the target
level and aborts if they are the same. Since the core will not call the
set_bias_level() callback if we already are in the target state the result
of the check is always false.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 81024b11

sound/soc/codecs/uda1380.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -590,9 +590,6 @@ static int uda1380_set_bias_level(struct snd_soc_codec *codec,
		int reg;
		struct uda1380_platform_data *pdata = codec->dev->platform_data;

		if (codec->dapm.bias_level == level)
		return 0;

		switch (level) {
		case SND_SOC_BIAS_ON:
		case SND_SOC_BIAS_PREPARE:
		@@ -600,7 +597,7 @@ static int uda1380_set_bias_level(struct snd_soc_codec *codec,
		uda1380_write(codec, UDA1380_PM, R02_PON_BIAS \| pm);
		break;
		case SND_SOC_BIAS_STANDBY:
		if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
		if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
		if (gpio_is_valid(pdata->gpio_power)) {
		gpio_set_value(pdata->gpio_power, 1);
		mdelay(1);