ASoC: cq93vc: duplicated callback function goes to component
authorArnd Bergmann <arnd@arndb.de>
Thu, 22 Sep 2016 09:37:32 +0000 (11:37 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 22 Sep 2016 10:23:59 +0000 (11:23 +0100)
A cleanup removed a couple of members from struct snd_soc_codec_driver
after changing codec drivers to no longer use them, but one codec
was missed in the process, giving a build error:

sound/soc/codecs/cq93vc.c:134:2: error: unknown field 'controls' specified in initializer
  .controls = cq93vc_snd_controls,

This moves the members from the cq93vc codec driver to its component driver
just like the other codecs already had.

Fixes: 8073aefa6082 ("ASoC: remove codec duplicated callback function")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cq93vc.c

index 1c895a53001d9b313f0ef69cd0c9ab15ae54dfd8..7a2d9a2ee4276de62e659f1372224fa84e4cdc73 100644 (file)
@@ -131,8 +131,10 @@ static struct regmap *cq93vc_get_regmap(struct device *dev)
 static struct snd_soc_codec_driver soc_codec_dev_cq93vc = {
        .set_bias_level = cq93vc_set_bias_level,
        .get_regmap = cq93vc_get_regmap,
-       .controls = cq93vc_snd_controls,
-       .num_controls = ARRAY_SIZE(cq93vc_snd_controls),
+       .component_driver = {
+               .controls = cq93vc_snd_controls,
+               .num_controls = ARRAY_SIZE(cq93vc_snd_controls),
+       },
 };
 
 static int cq93vc_platform_probe(struct platform_device *pdev)