]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: codec duplicated callback function goes to component on adau1373
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 09:09:04 +0000 (09:09 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Aug 2016 10:57:57 +0000 (11:57 +0100)
codec driver and component driver has duplicated callback functions,
and codec side functions are just copied to component side when
register timing. This was quick-hack, but no longer needed.
This patch moves these functions from codec driver to component driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/adau1373.c

index 1556b360fa1516b2c5048b980274e72d8540a228..8fa9045571ff44f7b9a698197d8d066e42695e64 100644 (file)
@@ -1466,12 +1466,14 @@ static struct snd_soc_codec_driver adau1373_codec_driver = {
 
        .set_pll = adau1373_set_pll,
 
-       .controls = adau1373_controls,
-       .num_controls = ARRAY_SIZE(adau1373_controls),
-       .dapm_widgets = adau1373_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(adau1373_dapm_widgets),
-       .dapm_routes = adau1373_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(adau1373_dapm_routes),
+       .component_driver = {
+               .controls               = adau1373_controls,
+               .num_controls           = ARRAY_SIZE(adau1373_controls),
+               .dapm_widgets           = adau1373_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(adau1373_dapm_widgets),
+               .dapm_routes            = adau1373_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(adau1373_dapm_routes),
+       },
 };
 
 static int adau1373_i2c_probe(struct i2c_client *client,