ASoC: codec duplicated callback function goes to component on pcm1681

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>

diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index 33e1fc2d1598bcc0a0f19647644663c9035facfe..0b14efab6280dd88b7a72c7df84fb3625a15f650 100644 (file)
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
@@ -289,12 +289,14 @@ static const struct regmap_config pcm1681_regmap = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_pcm1681 = {
-       .controls               = pcm1681_controls,
-       .num_controls           = ARRAY_SIZE(pcm1681_controls),
-       .dapm_widgets           = pcm1681_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(pcm1681_dapm_widgets),
-       .dapm_routes            = pcm1681_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(pcm1681_dapm_routes),
+       .component_driver = {
+               .controls               = pcm1681_controls,
+               .num_controls           = ARRAY_SIZE(pcm1681_controls),
+               .dapm_widgets           = pcm1681_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(pcm1681_dapm_widgets),
+               .dapm_routes            = pcm1681_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(pcm1681_dapm_routes),
+       },
 };
 
 static const struct i2c_device_id pcm1681_i2c_id[] = {