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

index 35488f14e2378ada271328a97504a9558b746836..96cfe38943cd44aa29885c76fbe48b4b8391d9a3 100644 (file)
@@ -507,12 +507,14 @@ static int cs42l51_codec_probe(struct snd_soc_codec *codec)
 static struct snd_soc_codec_driver soc_codec_device_cs42l51 = {
        .probe = cs42l51_codec_probe,
 
-       .controls = cs42l51_snd_controls,
-       .num_controls = ARRAY_SIZE(cs42l51_snd_controls),
-       .dapm_widgets = cs42l51_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(cs42l51_dapm_widgets),
-       .dapm_routes = cs42l51_routes,
-       .num_dapm_routes = ARRAY_SIZE(cs42l51_routes),
+       .component_driver = {
+               .controls               = cs42l51_snd_controls,
+               .num_controls           = ARRAY_SIZE(cs42l51_snd_controls),
+               .dapm_widgets           = cs42l51_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cs42l51_dapm_widgets),
+               .dapm_routes            = cs42l51_routes,
+               .num_dapm_routes        = ARRAY_SIZE(cs42l51_routes),
+       },
 };
 
 const struct regmap_config cs42l51_regmap = {