ASoC: codec duplicated callback function goes to component on ssm4567

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>

1 files changed, 8 insertions, 6 deletions

diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c
index 080c78e88e10..2bb5a11c9ba1 100644
--- a/sound/soc/codecs/ssm4567.c
+++ b/sound/soc/codecs/ssm4567.c
@@ -421,12 +421,14 @@ static struct snd_soc_codec_driver ssm4567_codec_driver = {
         .set_bias_level = ssm4567_set_bias_level,
         .idle_bias_off = true,
 
-        .controls = ssm4567_snd_controls,
-        .num_controls = ARRAY_SIZE(ssm4567_snd_controls),
-        .dapm_widgets = ssm4567_dapm_widgets,
-        .num_dapm_widgets = ARRAY_SIZE(ssm4567_dapm_widgets),
-        .dapm_routes = ssm4567_routes,
-        .num_dapm_routes = ARRAY_SIZE(ssm4567_routes),
+        .component_driver = {
+                .controls               = ssm4567_snd_controls,
+                .num_controls           = ARRAY_SIZE(ssm4567_snd_controls),
+                .dapm_widgets           = ssm4567_dapm_widgets,
+                .num_dapm_widgets       = ARRAY_SIZE(ssm4567_dapm_widgets),
+                .dapm_routes            = ssm4567_routes,
+                .num_dapm_routes        = ARRAY_SIZE(ssm4567_routes),
+        },
 };
 
 static const struct regmap_config ssm4567_regmap_config = {