Merge remote-tracking branches 'asoc/topic/nau8810', 'asoc/topic/of-bool', 'asoc...

[cascardo/linux.git] / sound / soc / codecs / wm8978.c

diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index d36d600..90b2d41 100644 (file)
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -993,18 +993,20 @@ static int wm8978_probe(struct snd_soc_codec *codec)
        return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8978 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8978 = {
        .probe =        wm8978_probe,
        .suspend =      wm8978_suspend,
        .resume =       wm8978_resume,
        .set_bias_level = wm8978_set_bias_level,
 
-       .controls = wm8978_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8978_snd_controls),
-       .dapm_widgets = wm8978_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8978_dapm_widgets),
-       .dapm_routes = wm8978_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8978_dapm_routes),
+       .component_driver = {
+               .controls               = wm8978_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8978_snd_controls),
+               .dapm_widgets           = wm8978_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8978_dapm_widgets),
+               .dapm_routes            = wm8978_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8978_dapm_routes),
+       },
 };
 
 static const struct regmap_config wm8978_regmap_config = {