diff options
| author | Timur Tabi <timur@freescale.com> | 2012-09-20 20:57:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-21 14:35:06 +0200 |
| commit | 0534951ba493a97eee646f62101cf88fac2308c6 (patch) | |
| tree | 13a941ac3ae1d20f3cde2d56d3d2ab811ac3c372 | |
| parent | ASoC: wm8961: Move device identification and reset to I2C probe (diff) | |
| download | linux-0534951ba493a97eee646f62101cf88fac2308c6.tar.xz linux-0534951ba493a97eee646f62101cf88fac2308c6.zip | |
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>
| -rw-r--r-- | include/sound/wm8960.h | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/sound/wm8960.h b/include/sound/wm8960.h index b5a1ab9ebb4a..e8ce8ee7d62d 100644 --- 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 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) 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; } |