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

index 992a77edcd5d1ff90d8857860972dadc4b86d7d7..39bc02d5bc5dd54880ddee611cbf89000432f5e8 100644 (file)
@@ -599,12 +599,14 @@ EXPORT_SYMBOL_GPL(pcm3168a_regmap);
 
 static const struct snd_soc_codec_driver pcm3168a_driver = {
        .idle_bias_off = true,
-       .controls = pcm3168a_snd_controls,
-       .num_controls = ARRAY_SIZE(pcm3168a_snd_controls),
-       .dapm_widgets = pcm3168a_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(pcm3168a_dapm_widgets),
-       .dapm_routes = pcm3168a_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(pcm3168a_dapm_routes)
+       .component_driver = {
+               .controls               = pcm3168a_snd_controls,
+               .num_controls           = ARRAY_SIZE(pcm3168a_snd_controls),
+               .dapm_widgets           = pcm3168a_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(pcm3168a_dapm_widgets),
+               .dapm_routes            = pcm3168a_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(pcm3168a_dapm_routes)
+       },
 };
 
 int pcm3168a_probe(struct device *dev, struct regmap *regmap)