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

index 42a8fd4e1f9b3f284d6dcc01dc67cf6475d5a192..01b573ab7036bd4f296f230f4f7186e695662c4c 100644 (file)
@@ -1257,13 +1257,14 @@ static const struct snd_soc_codec_driver soc_codec_dev_cs42l73 = {
        .set_bias_level = cs42l73_set_bias_level,
        .suspend_bias_off = true,
 
-       .dapm_widgets = cs42l73_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(cs42l73_dapm_widgets),
-       .dapm_routes = cs42l73_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(cs42l73_audio_map),
-
-       .controls = cs42l73_snd_controls,
-       .num_controls = ARRAY_SIZE(cs42l73_snd_controls),
+       .component_driver = {
+               .controls               = cs42l73_snd_controls,
+               .num_controls           = ARRAY_SIZE(cs42l73_snd_controls),
+               .dapm_widgets           = cs42l73_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cs42l73_dapm_widgets),
+               .dapm_routes            = cs42l73_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(cs42l73_audio_map),
+       },
 };
 
 static const struct regmap_config cs42l73_regmap = {