Skip to content

Commit 0534951

Browse files
Timur Tabibroonie
authored andcommitted
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 <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent b306e84 commit 0534951

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

include/sound/wm8960.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
struct wm8960_data {
1919
bool capless; /* Headphone outputs configured in capless mode */
2020

21-
int dres; /* Discharge resistance for headphone outputs */
22-
2321
bool shared_lrclk; /* DAC and ADC LRCLKs are wired together */
2422
};
2523

sound/soc/codecs/wm8960.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -962,11 +962,6 @@ static int wm8960_probe(struct snd_soc_codec *codec)
962962
if (!pdata) {
963963
dev_warn(codec->dev, "No platform data supplied\n");
964964
} 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-
970965
if (pdata->capless)
971966
wm8960->set_bias_level = wm8960_set_bias_level_capless;
972967
}

0 commit comments

Comments
 (0)