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>

diff --git a/include/sound/wm8960.h b/include/sound/wm8960.h
index b5a1ab9ebb4a11af34d8c75de5af565d3e66cbe6..e8ce8ee7d62d996c0be5cd7ecb93baabefc37a57 100644 (file)
--- a/include/sound/wm8960.h
+++ b/include/sound/wm8960.h
@@ -18,8 +18,6 @@
 struct wm8960_data {
        bool capless;  /* Headphone outputs configured in capless mode */
 
-       int dres;  /* Discharge resistance for headphone outputs */
-
        bool shared_lrclk;  /* DAC and ADC LRCLKs are wired together */
 };
 

diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index 782faa0a3b498e0e937d1fa032402a78644d7ee7..f0f6f66017859c7e8b5fcab1f470565d8a6cdd88 100644 (file)
--- 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)
        if (!pdata) {
                dev_warn(codec->dev, "No platform data supplied\n");
        } else {
-               if (pdata->dres > WM8960_DRES_MAX) {
-                       dev_err(codec->dev, "Invalid DRES: %d\n", pdata->dres);
-                       pdata->dres = 0;
-               }
-
                if (pdata->capless)
                        wm8960->set_bias_level = wm8960_set_bias_level_capless;
        }