diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-22 11:37:32 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-22 11:23:59 +0100 |
| commit | 8180bd56bdd1dcade8d1b2a0b6f70b2397bec372 (patch) | |
| tree | 33fdb322fce4a3f5d1b3bfd8d75a7f8772c7d024 /sound | |
| parent | f802d6c020658b5dce1732da0d5999a1a65afdd6 (diff) | |
| download | linux-8180bd56bdd1dcade8d1b2a0b6f70b2397bec372.tar.bz2 | |
ASoC: cq93vc: duplicated callback function goes to component
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/cq93vc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 1c895a53001d..7a2d9a2ee427 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -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) |