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

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

ASoC: AD1836: Use snd_soc_update_bits for read-modify-write 



Use snd_soc_update_bits for read-modify-write register access instead of
open-coding it using snd_soc_read and snd_soc_write.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 90bc11d1

sound/soc/codecs/ad1836.c

+6 −12
Original line number Diff line number Diff line
@@ -174,19 +174,15 @@ static int ad1836_soc_suspend(struct snd_soc_codec *codec, 
		pm_message_t state)

{

	/* reset clock control mode */

	u16 adc_ctrl2 = snd_soc_read(codec, AD1836_ADC_CTRL2);

	adc_ctrl2 &= ~AD1836_ADC_SERFMT_MASK;



	return snd_soc_write(codec, AD1836_ADC_CTRL2, adc_ctrl2);

	return snd_soc_update_bits(codec, AD1836_ADC_CTRL2,

		AD1836_ADC_SERFMT_MASK, 0);

}



static int ad1836_soc_resume(struct snd_soc_codec *codec)

{

	/* restore clock control mode */

	u16 adc_ctrl2 = snd_soc_read(codec, AD1836_ADC_CTRL2);

	adc_ctrl2 |= AD1836_ADC_AUX;



	return snd_soc_write(codec, AD1836_ADC_CTRL2, adc_ctrl2);

	return snd_soc_update_bits(codec, AD1836_ADC_CTRL2,

		AD1836_ADC_SERFMT_MASK, AD1836_ADC_AUX);

}

#else

#define ad1836_soc_suspend NULL
@@ -266,10 +262,8 @@ static int ad1836_probe(struct snd_soc_codec *codec) 
static int ad1836_remove(struct snd_soc_codec *codec)

{

	/* reset clock control mode */

	u16 adc_ctrl2 = snd_soc_read(codec, AD1836_ADC_CTRL2);

	adc_ctrl2 &= ~AD1836_ADC_SERFMT_MASK;



	return snd_soc_write(codec, AD1836_ADC_CTRL2, adc_ctrl2);

	return snd_soc_update_bits(codec, AD1836_ADC_CTRL2,

		AD1836_ADC_SERFMT_MASK, 0);

}



static struct snd_soc_codec_driver soc_codec_dev_ad1836 = {