Merge remote-tracking branches 'asoc/topic/nau8810', 'asoc/topic/of-bool', 'asoc...

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

diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c
index eec1ff8..54c1768 100644 (file)
--- a/sound/soc/codecs/cs42l56.c
+++ b/sound/soc/codecs/cs42l56.c
@@ -1121,13 +1121,14 @@ static const struct snd_soc_codec_driver soc_codec_dev_cs42l56 = {
        .set_bias_level = cs42l56_set_bias_level,
        .suspend_bias_off = true,
 
-       .dapm_widgets = cs42l56_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(cs42l56_dapm_widgets),
-       .dapm_routes = cs42l56_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(cs42l56_audio_map),
-
-       .controls = cs42l56_snd_controls,
-       .num_controls = ARRAY_SIZE(cs42l56_snd_controls),
+       .component_driver = {
+               .controls               = cs42l56_snd_controls,
+               .num_controls           = ARRAY_SIZE(cs42l56_snd_controls),
+               .dapm_widgets           = cs42l56_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cs42l56_dapm_widgets),
+               .dapm_routes            = cs42l56_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(cs42l56_audio_map),
+       },
 };
 
 static const struct regmap_config cs42l56_regmap = {