aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8991.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8991.c')
-rw-r--r--sound/soc/codecs/wm8991.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c
index c9ab3ba9bce..7ee40da8dbb 100644
--- a/sound/soc/codecs/wm8991.c
+++ b/sound/soc/codecs/wm8991.c
@@ -18,7 +18,6 @@
18#include <linux/delay.h> 18#include <linux/delay.h>
19#include <linux/pm.h> 19#include <linux/pm.h>
20#include <linux/i2c.h> 20#include <linux/i2c.h>
21#include <linux/platform_device.h>
22#include <linux/slab.h> 21#include <linux/slab.h>
23#include <sound/core.h> 22#include <sound/core.h>
24#include <sound/pcm.h> 23#include <sound/pcm.h>
@@ -770,8 +769,8 @@ static const struct snd_soc_dapm_widget wm8991_dapm_widgets[] = {
770 NULL, 0), 769 NULL, 0),
771 770
772 /* MICBIAS */ 771 /* MICBIAS */
773 SND_SOC_DAPM_MICBIAS("MICBIAS", WM8991_POWER_MANAGEMENT_1, 772 SND_SOC_DAPM_SUPPLY("MICBIAS", WM8991_POWER_MANAGEMENT_1,
774 WM8991_MICBIAS_ENA_BIT, 0), 773 WM8991_MICBIAS_ENA_BIT, 0, NULL, 0),
775 774
776 SND_SOC_DAPM_OUTPUT("LON"), 775 SND_SOC_DAPM_OUTPUT("LON"),
777 SND_SOC_DAPM_OUTPUT("LOP"), 776 SND_SOC_DAPM_OUTPUT("LOP"),
@@ -1241,7 +1240,7 @@ static int wm8991_set_bias_level(struct snd_soc_codec *codec,
1241 return 0; 1240 return 0;
1242} 1241}
1243 1242
1244static int wm8991_suspend(struct snd_soc_codec *codec, pm_message_t state) 1243static int wm8991_suspend(struct snd_soc_codec *codec)
1245{ 1244{
1246 wm8991_set_bias_level(codec, SND_SOC_BIAS_OFF); 1245 wm8991_set_bias_level(codec, SND_SOC_BIAS_OFF);
1247 return 0; 1246 return 0;
@@ -1311,7 +1310,7 @@ static int wm8991_probe(struct snd_soc_codec *codec)
1311#define WM8991_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ 1310#define WM8991_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
1312 SNDRV_PCM_FMTBIT_S24_LE) 1311 SNDRV_PCM_FMTBIT_S24_LE)
1313 1312
1314static struct snd_soc_dai_ops wm8991_ops = { 1313static const struct snd_soc_dai_ops wm8991_ops = {
1315 .hw_params = wm8991_hw_params, 1314 .hw_params = wm8991_hw_params,
1316 .digital_mute = wm8991_mute, 1315 .digital_mute = wm8991_mute,
1317 .set_fmt = wm8991_set_dai_fmt, 1316 .set_fmt = wm8991_set_dai_fmt,