Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ak4104', 'asoc/topic...

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

diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 5d8c5b6..06bae3b 100644 (file)
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -2355,7 +2355,7 @@ static struct regmap *wm5110_get_regmap(struct device *dev)
        return priv->core.arizona->regmap;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm5110 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm5110 = {
        .probe = wm5110_codec_probe,
        .remove = wm5110_codec_remove,
        .get_regmap = wm5110_get_regmap,
@@ -2365,12 +2365,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm5110 = {
        .set_sysclk = arizona_set_sysclk,
        .set_pll = wm5110_set_fll,
 
-       .controls = wm5110_snd_controls,
-       .num_controls = ARRAY_SIZE(wm5110_snd_controls),
-       .dapm_widgets = wm5110_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm5110_dapm_widgets),
-       .dapm_routes = wm5110_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm5110_dapm_routes),
+       .component_driver = {
+               .controls               = wm5110_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm5110_snd_controls),
+               .dapm_widgets           = wm5110_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm5110_dapm_widgets),
+               .dapm_routes            = wm5110_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm5110_dapm_routes),
+       },
 };
 
 static struct snd_compr_ops wm5110_compr_ops = {