ASoC: codec duplicated callback function goes to component on 88pm860x-codec

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/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index e8bed6b0c9db..b013a4c62b63 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -1361,12 +1361,14 @@ static struct snd_soc_codec_driver soc_codec_dev_pm860x = {
         .set_bias_level = pm860x_set_bias_level,
         .get_regmap     = pm860x_get_regmap,
 
-        .controls = pm860x_snd_controls,
-        .num_controls = ARRAY_SIZE(pm860x_snd_controls),
-        .dapm_widgets = pm860x_dapm_widgets,
-        .num_dapm_widgets = ARRAY_SIZE(pm860x_dapm_widgets),
-        .dapm_routes = pm860x_dapm_routes,
-        .num_dapm_routes = ARRAY_SIZE(pm860x_dapm_routes),
+        .component_driver = {
+                .controls               = pm860x_snd_controls,
+                .num_controls           = ARRAY_SIZE(pm860x_snd_controls),
+                .dapm_widgets           = pm860x_dapm_widgets,
+                .num_dapm_widgets       = ARRAY_SIZE(pm860x_dapm_widgets),
+                .dapm_routes            = pm860x_dapm_routes,
+                .num_dapm_routes        = ARRAY_SIZE(pm860x_dapm_routes),
+        },
 };
 
 static int pm860x_codec_probe(struct platform_device *pdev)