1 files changed, 9 insertions, 7 deletions

diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 66602bf02f6e..faa7287a5253 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -899,17 +899,19 @@ static int wm8580_remove(struct snd_soc_codec *codec)
         return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8580 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8580 = {
         .probe =        wm8580_probe,
         .remove =       wm8580_remove,
         .set_bias_level = wm8580_set_bias_level,
 
-        .controls = wm8580_snd_controls,
-        .num_controls = ARRAY_SIZE(wm8580_snd_controls),
-        .dapm_widgets = wm8580_dapm_widgets,
-        .num_dapm_widgets = ARRAY_SIZE(wm8580_dapm_widgets),
-        .dapm_routes = wm8580_dapm_routes,
-        .num_dapm_routes = ARRAY_SIZE(wm8580_dapm_routes),
+        .component_driver = {
+                .controls               = wm8580_snd_controls,
+                .num_controls           = ARRAY_SIZE(wm8580_snd_controls),
+                .dapm_widgets           = wm8580_dapm_widgets,
+                .num_dapm_widgets       = ARRAY_SIZE(wm8580_dapm_widgets),
+                .dapm_routes            = wm8580_dapm_routes,
+                .num_dapm_routes        = ARRAY_SIZE(wm8580_dapm_routes),
+        },
 };
 
 static const struct of_device_id wm8580_of_match[] = {