aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8985.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8985.c')
-rw-r--r--sound/soc/codecs/wm8985.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index bae510acdec8..c0c86b3c6adf 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -411,7 +411,8 @@ static const struct snd_soc_dapm_widget wm8985_dapm_widgets[] = {
411 SND_SOC_DAPM_PGA("Right Speaker Out", WM8985_POWER_MANAGEMENT_3, 411 SND_SOC_DAPM_PGA("Right Speaker Out", WM8985_POWER_MANAGEMENT_3,
412 6, 0, NULL, 0), 412 6, 0, NULL, 0),
413 413
414 SND_SOC_DAPM_MICBIAS("Mic Bias", WM8985_POWER_MANAGEMENT_1, 4, 0), 414 SND_SOC_DAPM_SUPPLY("Mic Bias", WM8985_POWER_MANAGEMENT_1, 4, 0,
415 NULL, 0),
415 416
416 SND_SOC_DAPM_INPUT("LIN"), 417 SND_SOC_DAPM_INPUT("LIN"),
417 SND_SOC_DAPM_INPUT("LIP"), 418 SND_SOC_DAPM_INPUT("LIP"),
@@ -944,7 +945,7 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec,
944} 945}
945 946
946#ifdef CONFIG_PM 947#ifdef CONFIG_PM
947static int wm8985_suspend(struct snd_soc_codec *codec, pm_message_t state) 948static int wm8985_suspend(struct snd_soc_codec *codec)
948{ 949{
949 wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF); 950 wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
950 return 0; 951 return 0;
@@ -1030,7 +1031,7 @@ err_reg_get:
1030 return ret; 1031 return ret;
1031} 1032}
1032 1033
1033static struct snd_soc_dai_ops wm8985_dai_ops = { 1034static const struct snd_soc_dai_ops wm8985_dai_ops = {
1034 .digital_mute = wm8985_dac_mute, 1035 .digital_mute = wm8985_dac_mute,
1035 .hw_params = wm8985_hw_params, 1036 .hw_params = wm8985_hw_params,
1036 .set_fmt = wm8985_set_fmt, 1037 .set_fmt = wm8985_set_fmt,