aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8988.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8988.c')
-rw-r--r--sound/soc/codecs/wm8988.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index 2e9eba717d1a..ab52963dd04c 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -18,7 +18,6 @@
18#include <linux/pm.h> 18#include <linux/pm.h>
19#include <linux/i2c.h> 19#include <linux/i2c.h>
20#include <linux/spi/spi.h> 20#include <linux/spi/spi.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>
@@ -267,7 +266,7 @@ static const struct snd_kcontrol_new wm8988_monomux_controls =
267 SOC_DAPM_ENUM("Route", monomux); 266 SOC_DAPM_ENUM("Route", monomux);
268 267
269static const struct snd_soc_dapm_widget wm8988_dapm_widgets[] = { 268static const struct snd_soc_dapm_widget wm8988_dapm_widgets[] = {
270 SND_SOC_DAPM_MICBIAS("Mic Bias", WM8988_PWR1, 1, 0), 269 SND_SOC_DAPM_SUPPLY("Mic Bias", WM8988_PWR1, 1, 0, NULL, 0),
271 270
272 SND_SOC_DAPM_MUX("Differential Mux", SND_SOC_NOPM, 0, 0, 271 SND_SOC_DAPM_MUX("Differential Mux", SND_SOC_NOPM, 0, 0,
273 &wm8988_diffmux_controls), 272 &wm8988_diffmux_controls),
@@ -701,7 +700,7 @@ static int wm8988_set_bias_level(struct snd_soc_codec *codec,
701#define WM8988_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ 700#define WM8988_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
702 SNDRV_PCM_FMTBIT_S24_LE) 701 SNDRV_PCM_FMTBIT_S24_LE)
703 702
704static struct snd_soc_dai_ops wm8988_ops = { 703static const struct snd_soc_dai_ops wm8988_ops = {
705 .startup = wm8988_pcm_startup, 704 .startup = wm8988_pcm_startup,
706 .hw_params = wm8988_pcm_hw_params, 705 .hw_params = wm8988_pcm_hw_params,
707 .set_fmt = wm8988_set_dai_fmt, 706 .set_fmt = wm8988_set_dai_fmt,
@@ -729,7 +728,7 @@ static struct snd_soc_dai_driver wm8988_dai = {
729 .symmetric_rates = 1, 728 .symmetric_rates = 1,
730}; 729};
731 730
732static int wm8988_suspend(struct snd_soc_codec *codec, pm_message_t state) 731static int wm8988_suspend(struct snd_soc_codec *codec)
733{ 732{
734 wm8988_set_bias_level(codec, SND_SOC_BIAS_OFF); 733 wm8988_set_bias_level(codec, SND_SOC_BIAS_OFF);
735 return 0; 734 return 0;
@@ -823,7 +822,7 @@ static int __devexit wm8988_spi_remove(struct spi_device *spi)
823 822
824static struct spi_driver wm8988_spi_driver = { 823static struct spi_driver wm8988_spi_driver = {
825 .driver = { 824 .driver = {
826 .name = "wm8988-codec", 825 .name = "wm8988",
827 .owner = THIS_MODULE, 826 .owner = THIS_MODULE,
828 }, 827 },
829 .probe = wm8988_spi_probe, 828 .probe = wm8988_spi_probe,