1 files changed, 6 insertions, 5 deletions

diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index 9ee072b85975..d54a3ca5e19e 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -542,7 +542,7 @@ static int wm8804_set_bias_level(struct snd_soc_codec *codec,
 }
 
 #ifdef CONFIG_PM
-static int wm8804_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8804_suspend(struct snd_soc_codec *codec)
 {
         wm8804_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
@@ -659,8 +659,6 @@ static int wm8804_probe(struct snd_soc_codec *codec)
 
         wm8804_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        snd_soc_add_controls(codec, wm8804_snd_controls,
-                             ARRAY_SIZE(wm8804_snd_controls));
         return 0;
 
 err_reg_enable:
@@ -670,7 +668,7 @@ err_reg_get:
         return ret;
 }
 
-static struct snd_soc_dai_ops wm8804_dai_ops = {
+static const struct snd_soc_dai_ops wm8804_dai_ops = {
         .hw_params = wm8804_hw_params,
         .set_fmt = wm8804_set_fmt,
         .set_sysclk = wm8804_set_sysclk,
@@ -715,7 +713,10 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8804 = {
         .reg_cache_size = ARRAY_SIZE(wm8804_reg_defs),
         .reg_word_size = sizeof(u8),
         .reg_cache_default = wm8804_reg_defs,
-        .volatile_register = wm8804_volatile
+        .volatile_register = wm8804_volatile,
+
+        .controls = wm8804_snd_controls,
+        .num_controls = ARRAY_SIZE(wm8804_snd_controls),
 };
 
 static const struct of_device_id wm8804_of_match[] = {