summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/sound/wm8960.h2
-rw-r--r--sound/soc/codecs/wm8960.c5
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;
}