Merge remote-tracking branch 'regulator/for-next'

[deliverable/linux.git] / sound / soc / codecs / wm8955.c

diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index 9db00d53abe76f58be4e74a4b4e5342c3a19147d..1edc7b1df31de2a845fb1a5e06669a3b09bdd2c4 100644 (file)
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -940,17 +940,19 @@ err_enable:
        return ret;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8955 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8955 = {
        .probe =        wm8955_probe,
        .set_bias_level = wm8955_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls =     wm8955_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8955_snd_controls),
-       .dapm_widgets = wm8955_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8955_dapm_widgets),
-       .dapm_routes =  wm8955_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8955_dapm_routes),
+       .component_driver = {
+               .controls               = wm8955_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8955_snd_controls),
+               .dapm_widgets           = wm8955_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8955_dapm_widgets),
+               .dapm_routes            = wm8955_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8955_dapm_routes),
+       },
 };
 
 static const struct regmap_config wm8955_regmap = {