diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-28 07:52:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-28 10:57:34 -0400 |
| commit | 287d03e9cd41a5f60bf96f43f8efea454f1cf74e (patch) | |
| tree | 407a33511c1039cd68fc4916dd9606824e1f8a90 | |
| parent | 435705e89265dec3c641fe75deb748f05e232e59 (diff) | |
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>
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 16 |
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) | |||
| 3131 | struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); | 3131 | struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); |
| 3132 | struct wm8994 *control = wm8994->wm8994; | 3132 | struct wm8994 *control = wm8994->wm8994; |
| 3133 | int i, ret; | 3133 | int i, ret; |
| 3134 | unsigned int val, mask; | ||
| 3135 | |||
| 3136 | if (control->revision < 4) { | ||
| 3137 | /* force a HW read */ | ||
| 3138 | ret = regmap_read(control->regmap, | ||
| 3139 | WM8994_POWER_MANAGEMENT_5, &val); | ||
| 3140 | |||
| 3141 | /* modify the cache only */ | ||
| 3142 | codec->cache_only = 1; | ||
| 3143 | mask = WM8994_DAC1R_ENA | WM8994_DAC1L_ENA | | ||
| 3144 | WM8994_DAC2R_ENA | WM8994_DAC2L_ENA; | ||
| 3145 | val &= mask; | ||
| 3146 | snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5, | ||
| 3147 | mask, val); | ||
| 3148 | codec->cache_only = 0; | ||
| 3149 | } | ||
| 3150 | 3134 | ||
| 3151 | for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) { | 3135 | for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) { |
| 3152 | if (!wm8994->fll_suspend[i].out) | 3136 | if (!wm8994->fll_suspend[i].out) |
