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

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

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index d18261a..4f9a1eb 100644 (file)
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -628,16 +628,18 @@ err_regulator_enable:
        return ret;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8731 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8731 = {
        .set_bias_level = wm8731_set_bias_level,
        .suspend_bias_off = true,
 
-       .dapm_widgets = wm8731_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
-       .dapm_routes = wm8731_intercon,
-       .num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
-       .controls =     wm8731_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8731_snd_controls),
+       .component_driver = {
+               .controls               = wm8731_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8731_snd_controls),
+               .dapm_widgets           = wm8731_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8731_dapm_widgets),
+               .dapm_routes            = wm8731_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(wm8731_intercon),
+       },
 };
 
 static const struct of_device_id wm8731_of_match[] = {