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

index d49d25d5195796345bee582537fa3751d4eacfa6..c297b9fc8bf6e9f908b3554d1ba17d1241d28abc 100644 (file)
@@ -890,12 +890,14 @@ static struct snd_soc_codec_driver soc_codec_dev_tas5086 = {
        .remove                 = tas5086_remove,
        .suspend                = tas5086_soc_suspend,
        .resume                 = tas5086_soc_resume,
-       .controls               = tas5086_controls,
-       .num_controls           = ARRAY_SIZE(tas5086_controls),
-       .dapm_widgets           = tas5086_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(tas5086_dapm_widgets),
-       .dapm_routes            = tas5086_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(tas5086_dapm_routes),
+       .component_driver = {
+               .controls               = tas5086_controls,
+               .num_controls           = ARRAY_SIZE(tas5086_controls),
+               .dapm_widgets           = tas5086_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(tas5086_dapm_widgets),
+               .dapm_routes            = tas5086_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(tas5086_dapm_routes),
+       },
 };
 
 static const struct i2c_device_id tas5086_i2c_id[] = {