Merge remote-tracking branch 'sound-asoc/for-next'

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

diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index fd1439ecb50ad312e24c9bf7e735b7728c96d6c9..606bf88abfc444a9036695eebb0e459419041997 100644 (file)
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -2103,7 +2103,7 @@ static struct snd_soc_dai_driver wm2200_dai = {
        .ops = &wm2200_dai_ops,
 };
 
-static struct snd_soc_codec_driver soc_codec_wm2200 = {
+static const struct snd_soc_codec_driver soc_codec_wm2200 = {
        .probe = wm2200_probe,
 
        .idle_bias_off = true,
@@ -2111,12 +2111,14 @@ static struct snd_soc_codec_driver soc_codec_wm2200 = {
        .set_sysclk = wm2200_set_sysclk,
        .set_pll = wm2200_set_fll,
 
-       .controls = wm2200_snd_controls,
-       .num_controls = ARRAY_SIZE(wm2200_snd_controls),
-       .dapm_widgets = wm2200_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm2200_dapm_widgets),
-       .dapm_routes = wm2200_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm2200_dapm_routes),
+       .component_driver = {
+               .controls               = wm2200_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm2200_snd_controls),
+               .dapm_widgets           = wm2200_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm2200_dapm_widgets),
+               .dapm_routes            = wm2200_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm2200_dapm_routes),
+       },
 };
 
 static irqreturn_t wm2200_irq(int irq, void *data)