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

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

diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 512a9d25fe6f34e82aeaeb0065673aa7a43c931f..560575000cc5e5aef666570c78e1f8df714ad718 100644 (file)
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -2285,7 +2285,7 @@ static int wm5100_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
                                  (1 << WM5100_GP1_DIR_SHIFT));
 }
 
-static struct gpio_chip wm5100_template_chip = {
+static const struct gpio_chip wm5100_template_chip = {
        .label                  = "wm5100",
        .owner                  = THIS_MODULE,
        .direction_output       = wm5100_gpio_direction_out,
@@ -2381,7 +2381,7 @@ static int wm5100_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm5100 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm5100 = {
        .probe =        wm5100_probe,
        .remove =       wm5100_remove,
 
@@ -2390,12 +2390,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm5100 = {
        .idle_bias_off = 1,
 
        .seq_notifier = wm5100_seq_notifier,
-       .controls = wm5100_snd_controls,
-       .num_controls = ARRAY_SIZE(wm5100_snd_controls),
-       .dapm_widgets = wm5100_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm5100_dapm_widgets),
-       .dapm_routes = wm5100_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm5100_dapm_routes),
+       .component_driver = {
+               .controls               = wm5100_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm5100_snd_controls),
+               .dapm_widgets           = wm5100_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm5100_dapm_widgets),
+               .dapm_routes            = wm5100_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm5100_dapm_routes),
+       },
 };
 
 static const struct regmap_config wm5100_regmap = {