1 files changed, 9 insertions, 7 deletions

diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index e30446a04740..e23ceac76015 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -882,18 +882,20 @@ static int wm8961_resume(struct snd_soc_codec *codec)
 #define wm8961_resume NULL
 #endif
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8961 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8961 = {
         .probe =        wm8961_probe,
         .resume =       wm8961_resume,
         .set_bias_level = wm8961_set_bias_level,
         .suspend_bias_off = true,
 
-        .controls = wm8961_snd_controls,
-        .num_controls = ARRAY_SIZE(wm8961_snd_controls),
-        .dapm_widgets = wm8961_dapm_widgets,
-        .num_dapm_widgets = ARRAY_SIZE(wm8961_dapm_widgets),
-        .dapm_routes = audio_paths,
-        .num_dapm_routes = ARRAY_SIZE(audio_paths),
+        .component_driver = {
+                .controls               = wm8961_snd_controls,
+                .num_controls           = ARRAY_SIZE(wm8961_snd_controls),
+                .dapm_widgets           = wm8961_dapm_widgets,
+                .num_dapm_widgets       = ARRAY_SIZE(wm8961_dapm_widgets),
+                .dapm_routes            = audio_paths,
+                .num_dapm_routes        = ARRAY_SIZE(audio_paths),
+        },
 };
 
 static const struct regmap_config wm8961_regmap = {