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

index e5527bc570ae550394807f8062092af3e8f0a6e1..7cfb5da5378d2f17060e8b6cb06856c520be1ece 100644 (file)
@@ -1740,13 +1740,14 @@ static struct snd_soc_codec_driver soc_codec_dev_da7213 = {
        .probe                  = da7213_probe,
        .set_bias_level         = da7213_set_bias_level,
 
-       .controls               = da7213_snd_controls,
-       .num_controls           = ARRAY_SIZE(da7213_snd_controls),
-
-       .dapm_widgets           = da7213_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(da7213_dapm_widgets),
-       .dapm_routes            = da7213_audio_map,
-       .num_dapm_routes        = ARRAY_SIZE(da7213_audio_map),
+       .component_driver = {
+               .controls               = da7213_snd_controls,
+               .num_controls           = ARRAY_SIZE(da7213_snd_controls),
+               .dapm_widgets           = da7213_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(da7213_dapm_widgets),
+               .dapm_routes            = da7213_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(da7213_audio_map),
+       },
 };
 
 static const struct regmap_config da7213_regmap_config = {