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

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

diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index a7304425121855b701f1cf1d98ae70232ad84bc3..8affa49691200e47f6b6d4ed4462b5f1f6d5c37f 100644 (file)
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -2184,7 +2184,7 @@ static int wm8996_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
                                  (1 << WM8996_GP1_DIR_SHIFT));
 }
 
-static struct gpio_chip wm8996_template_chip = {
+static const struct gpio_chip wm8996_template_chip = {
        .label                  = "wm8996",
        .owner                  = THIS_MODULE,
        .direction_output       = wm8996_gpio_direction_out,
@@ -2684,18 +2684,20 @@ static int wm8996_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8996 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8996 = {
        .probe =        wm8996_probe,
        .remove =       wm8996_remove,
        .set_bias_level = wm8996_set_bias_level,
        .idle_bias_off  = true,
        .seq_notifier = wm8996_seq_notifier,
-       .controls = wm8996_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8996_snd_controls),
-       .dapm_widgets = wm8996_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8996_dapm_widgets),
-       .dapm_routes = wm8996_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8996_dapm_routes),
+       .component_driver = {
+               .controls               = wm8996_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8996_snd_controls),
+               .dapm_widgets           = wm8996_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8996_dapm_widgets),
+               .dapm_routes            = wm8996_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8996_dapm_routes),
+       },
        .set_pll = wm8996_set_fll,
 };