diff options
Diffstat (limited to 'sound/soc/codecs/wm8974.c')
-rw-r--r-- | sound/soc/codecs/wm8974.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index 15f45c7bd833..0627c56fa44e 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c | |||
@@ -84,8 +84,8 @@ static const struct soc_enum wm8974_enum[] = { | |||
84 | 84 | ||
85 | static const char *wm8974_auxmode_text[] = { "Buffer", "Mixer" }; | 85 | static const char *wm8974_auxmode_text[] = { "Buffer", "Mixer" }; |
86 | 86 | ||
87 | static const struct soc_enum wm8974_auxmode = | 87 | static SOC_ENUM_SINGLE_DECL(wm8974_auxmode, |
88 | SOC_ENUM_SINGLE(WM8974_INPUT, 3, 2, wm8974_auxmode_text); | 88 | WM8974_INPUT, 3, wm8974_auxmode_text); |
89 | 89 | ||
90 | static const DECLARE_TLV_DB_SCALE(digital_tlv, -12750, 50, 1); | 90 | static const DECLARE_TLV_DB_SCALE(digital_tlv, -12750, 50, 1); |
91 | static const DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); | 91 | static const DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0); |
@@ -593,12 +593,6 @@ static int wm8974_probe(struct snd_soc_codec *codec) | |||
593 | { | 593 | { |
594 | int ret = 0; | 594 | int ret = 0; |
595 | 595 | ||
596 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); | ||
597 | if (ret < 0) { | ||
598 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | ||
599 | return ret; | ||
600 | } | ||
601 | |||
602 | ret = wm8974_reset(codec); | 596 | ret = wm8974_reset(codec); |
603 | if (ret < 0) { | 597 | if (ret < 0) { |
604 | dev_err(codec->dev, "Failed to issue reset\n"); | 598 | dev_err(codec->dev, "Failed to issue reset\n"); |