From: Kuninori Morimoto <kuninori.morimoto...@renesas.com>

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...@renesas.com>
---
 sound/soc/codecs/wm0010.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index e3c34bd..4ef6919 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -795,10 +795,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wm0010 = 
{
        .set_sysclk = wm0010_set_sysclk,
        .idle_bias_off = true,
 
-       .dapm_widgets = wm0010_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm0010_dapm_widgets),
-       .dapm_routes = wm0010_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm0010_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = wm0010_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm0010_dapm_widgets),
+               .dapm_routes            = wm0010_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm0010_dapm_routes),
+       },
 };
 
 #define WM0010_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
-- 
1.9.1

Reply via email to