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

index 97798d250f08689eff1093979e2ce9bb116f66eb..e819dd8c82fdced146515a9da7c604f783bc2d32 100644 (file)
@@ -458,12 +458,14 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4613 = {
        .suspend                = ak4613_suspend,
        .resume                 = ak4613_resume,
        .set_bias_level         = ak4613_set_bias_level,
-       .controls               = ak4613_snd_controls,
-       .num_controls           = ARRAY_SIZE(ak4613_snd_controls),
-       .dapm_widgets           = ak4613_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(ak4613_dapm_widgets),
-       .dapm_routes            = ak4613_intercon,
-       .num_dapm_routes        = ARRAY_SIZE(ak4613_intercon),
+       .component_driver = {
+               .controls               = ak4613_snd_controls,
+               .num_controls           = ARRAY_SIZE(ak4613_snd_controls),
+               .dapm_widgets           = ak4613_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ak4613_dapm_widgets),
+               .dapm_routes            = ak4613_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(ak4613_intercon),
+       },
 };
 
 static void ak4613_parse_of(struct ak4613_priv *priv,