Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

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

diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 1c60081..b593562 100644 (file)
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -723,17 +723,19 @@ static int wm8940_probe(struct snd_soc_codec *codec)
        return ret;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8940 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8940 = {
        .probe =        wm8940_probe,
        .set_bias_level = wm8940_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls =     wm8940_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8940_snd_controls),
-       .dapm_widgets = wm8940_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8940_dapm_widgets),
-       .dapm_routes =  wm8940_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8940_dapm_routes),
+       .component_driver = {
+               .controls               = wm8940_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8940_snd_controls),
+               .dapm_widgets           = wm8940_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8940_dapm_widgets),
+               .dapm_routes            = wm8940_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8940_dapm_routes),
+       },
 };
 
 static const struct regmap_config wm8940_regmap = {