ASoC: codec duplicated callback function goes to component on adau1701
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 09:07:47 +0000 (09:07 +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/adau1701.c

index de53c0d..3bad1bc 100644 (file)
@@ -765,13 +765,14 @@ static struct snd_soc_codec_driver adau1701_codec_drv = {
        .set_bias_level         = adau1701_set_bias_level,
        .idle_bias_off          = true,
 
-       .controls               = adau1701_controls,
-       .num_controls           = ARRAY_SIZE(adau1701_controls),
-       .dapm_widgets           = adau1701_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(adau1701_dapm_widgets),
-       .dapm_routes            = adau1701_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(adau1701_dapm_routes),
-
+       .component_driver = {
+               .controls               = adau1701_controls,
+               .num_controls           = ARRAY_SIZE(adau1701_controls),
+               .dapm_widgets           = adau1701_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(adau1701_dapm_widgets),
+               .dapm_routes            = adau1701_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(adau1701_dapm_routes),
+       },
        .set_sysclk             = adau1701_set_sysclk,
 };