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

index e07807d96b68069b10c0e1319359b8ed52905ecc..18baea2f7d654528cf52617bfb0c58fc2e3b8efe 100644 (file)
@@ -617,12 +617,14 @@ static const struct snd_soc_codec_driver soc_codec_device_cs4270 = {
        .suspend =              cs4270_soc_suspend,
        .resume =               cs4270_soc_resume,
 
-       .controls =             cs4270_snd_controls,
-       .num_controls =         ARRAY_SIZE(cs4270_snd_controls),
-       .dapm_widgets =         cs4270_dapm_widgets,
-       .num_dapm_widgets =     ARRAY_SIZE(cs4270_dapm_widgets),
-       .dapm_routes =          cs4270_dapm_routes,
-       .num_dapm_routes =      ARRAY_SIZE(cs4270_dapm_routes),
+       .component_driver = {
+               .controls =             cs4270_snd_controls,
+               .num_controls =         ARRAY_SIZE(cs4270_snd_controls),
+               .dapm_widgets =         cs4270_dapm_widgets,
+               .num_dapm_widgets =     ARRAY_SIZE(cs4270_dapm_widgets),
+               .dapm_routes =          cs4270_dapm_routes,
+               .num_dapm_routes =      ARRAY_SIZE(cs4270_dapm_routes),
+       },
 };
 
 /*