ASoC: codec duplicated callback function goes to component on wm8804

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/wm8804.c b/sound/soc/codecs/wm8804.c
index 8d914702cae4a3fe2c0ca0599cd1ec79f7322c83..af95d648265b3e92e345101542b332aee35191d4 100644 (file)
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -545,10 +545,12 @@ static struct snd_soc_dai_driver wm8804_dai = {
 static const struct snd_soc_codec_driver soc_codec_dev_wm8804 = {
        .idle_bias_off = true,
 
-       .dapm_widgets = wm8804_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8804_dapm_widgets),
-       .dapm_routes = wm8804_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8804_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = wm8804_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8804_dapm_widgets),
+               .dapm_routes            = wm8804_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8804_dapm_routes),
+       },
 };
 
 const struct regmap_config wm8804_regmap_config = {