diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-11-03 19:33:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-04 11:49:48 +0000 |
| commit | 4539441690cd31ae7d42e6f080033911a1788440 (patch) | |
| tree | 73698afb3b66d8a59f0bc527991cf7779f135d63 /sound/soc/pxa | |
| parent | ecf0015161b2220879fcd41c030761b4eb561b95 (diff) | |
| download | linux-rt-4539441690cd31ae7d42e6f080033911a1788440.tar.gz | |
ASoC: mioa701_wm9713: Don't opencode CODEC register access
Properly use snd_soc_update_bits() instead of manually calling the CODEC
driver's read and write callbacks. The later will stop working once the
wm9713 driver has been converted to regmap.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/mioa701_wm9713.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c index 595eee341e90..a6b2be20cc0b 100644 --- a/sound/soc/pxa/mioa701_wm9713.c +++ b/sound/soc/pxa/mioa701_wm9713.c @@ -127,15 +127,12 @@ static const struct snd_soc_dapm_route audio_map[] = { static int mioa701_wm9713_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; - unsigned short reg; /* Prepare GPIO8 for rear speaker amplifier */ - reg = codec->driver->read(codec, AC97_GPIO_CFG); - codec->driver->write(codec, AC97_GPIO_CFG, reg | 0x0100); + snd_soc_update_bits(codec, AC97_GPIO_CFG, 0x100, 0x100); /* Prepare MIC input */ - reg = codec->driver->read(codec, AC97_3D_CONTROL); - codec->driver->write(codec, AC97_3D_CONTROL, reg | 0xc000); + snd_soc_update_bits(codec, AC97_3D_CONTROL, 0xc000, 0xc000); return 0; } |