1 files changed, 9 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c
index 6ba7dbf8b9cc..bcc2e1060a6c 100644
--- a/sound/soc/codecs/wm8998.c
+++ b/sound/soc/codecs/wm8998.c
@@ -1361,7 +1361,7 @@ static struct regmap *wm8998_get_regmap(struct device *dev)
        return priv->core.arizona->regmap;
 }
-static struct snd_soc_codec_driver soc_codec_dev_wm8998 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8998 = {
        .probe = wm8998_codec_probe,
        .remove = wm8998_codec_remove,
        .get_regmap = wm8998_get_regmap,
@@ -1371,12 +1371,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8998 = {
        .set_sysclk = arizona_set_sysclk,
        .set_pll = wm8998_set_fll,
-        .controls = wm8998_snd_controls,
+        .component_driver = {
-        .num_controls = ARRAY_SIZE(wm8998_snd_controls),
+                .controls               = wm8998_snd_controls,
-        .dapm_widgets = wm8998_dapm_widgets,
+                .num_controls           = ARRAY_SIZE(wm8998_snd_controls),
-        .num_dapm_widgets = ARRAY_SIZE(wm8998_dapm_widgets),
+                .dapm_widgets           = wm8998_dapm_widgets,
-        .dapm_routes = wm8998_dapm_routes,
+                .num_dapm_widgets       = ARRAY_SIZE(wm8998_dapm_widgets),
-        .num_dapm_routes = ARRAY_SIZE(wm8998_dapm_routes),
+                .dapm_routes            = wm8998_dapm_routes,
+                .num_dapm_routes        = ARRAY_SIZE(wm8998_dapm_routes),
+        },
 };
 static int wm8998_probe(struct platform_device *pdev)