aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2012-09-20 14:57:27 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-21 08:35:06 -0400
commit0534951ba493a97eee646f62101cf88fac2308c6 (patch)
tree13a941ac3ae1d20f3cde2d56d3d2ab811ac3c372 /sound/soc
parentb306e84f9a15e465812d9b66f8d6ecadae806f4c (diff)
ASoC: wm8960: remove 'dres' field from platform data structure
The 'dres' field (discharge resistance for headphone outputs) is no longer used in the driver, so remove it. It was used in the original version of the driver when entering standby from off, but we stopped using it when we switched from having a single startup sequence to having separate cap and capless sequences. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8960.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 782faa0a3b49..f0f6f6601785 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -962,11 +962,6 @@ static int wm8960_probe(struct snd_soc_codec *codec)
962 if (!pdata) { 962 if (!pdata) {
963 dev_warn(codec->dev, "No platform data supplied\n"); 963 dev_warn(codec->dev, "No platform data supplied\n");
964 } else { 964 } else {
965 if (pdata->dres > WM8960_DRES_MAX) {
966 dev_err(codec->dev, "Invalid DRES: %d\n", pdata->dres);
967 pdata->dres = 0;
968 }
969
970 if (pdata->capless) 965 if (pdata->capless)
971 wm8960->set_bias_level = wm8960_set_bias_level_capless; 966 wm8960->set_bias_level = wm8960_set_bias_level_capless;
972 } 967 }