summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown2013-05-28 13:52:07 +0200
committerMark Brown2013-05-28 16:57:34 +0200
commit287d03e9cd41a5f60bf96f43f8efea454f1cf74e (patch)
tree407a33511c1039cd68fc4916dd9606824e1f8a90 /sound/soc
parentASoC: wm8994: Handle LRCLK inversion for WM8958 and WM1811A (diff)
downloadkernel-qcow2-linux-287d03e9cd41a5f60bf96f43f8efea454f1cf74e.tar.gz
kernel-qcow2-linux-287d03e9cd41a5f60bf96f43f8efea454f1cf74e.tar.xz
kernel-qcow2-linux-287d03e9cd41a5f60bf96f43f8efea454f1cf74e.zip
ASoC: wm8994: Remove restore of DAC enable state
It's not been needed since the regmap conversion. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8994.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index f1c54af45dcf..a265fd42b700 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3131,22 +3131,6 @@ static int wm8994_codec_resume(struct snd_soc_codec *codec)
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
struct wm8994 *control = wm8994->wm8994;
int i, ret;
- unsigned int val, mask;
-
- if (control->revision < 4) {
- /* force a HW read */
- ret = regmap_read(control->regmap,
- WM8994_POWER_MANAGEMENT_5, &val);
-
- /* modify the cache only */
- codec->cache_only = 1;
- mask = WM8994_DAC1R_ENA | WM8994_DAC1L_ENA |
- WM8994_DAC2R_ENA | WM8994_DAC2L_ENA;
- val &= mask;
- snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,
- mask, val);
- codec->cache_only = 0;
- }
for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) {
if (!wm8994->fll_suspend[i].out)