Merge remote-tracking branches 'asoc/topic/rt5659', 'asoc/topic/rt5660', 'asoc/topic...

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

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index ffbf3df..2efc5b4 100644 (file)
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1587,19 +1587,21 @@ static struct regmap *wm8350_get_regmap(struct device *dev)
        return wm8350->regmap;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8350 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8350 = {
        .probe =        wm8350_codec_probe,
        .remove =       wm8350_codec_remove,
        .get_regmap =   wm8350_get_regmap,
        .set_bias_level = wm8350_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8350_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8350_snd_controls),
-       .dapm_widgets = wm8350_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8350_dapm_widgets),
-       .dapm_routes = wm8350_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8350_dapm_routes),
+       .component_driver = {
+               .controls               = wm8350_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8350_snd_controls),
+               .dapm_widgets           = wm8350_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8350_dapm_widgets),
+               .dapm_routes            = wm8350_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8350_dapm_routes),
+       },
 };
 
 static int wm8350_probe(struct platform_device *pdev)