ソースを参照

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>
Timur Tabi 13 年 前
コミット
0534951ba4
2 ファイル変更0 行追加7 行削除
  1. 0 2
      include/sound/wm8960.h
  2. 0 5
      sound/soc/codecs/wm8960.c

+ 0 - 2
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 */
 };
 

+ 0 - 5
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;
 	}