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/tlv320dac33.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index f7a6ce7..d64eac7 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -1453,12 +1453,14 @@ static struct snd_soc_codec_driver 
soc_codec_dev_tlv320dac33 = {
        .probe = dac33_soc_probe,
        .remove = dac33_soc_remove,
 
-       .controls = dac33_snd_controls,
-       .num_controls = ARRAY_SIZE(dac33_snd_controls),
-       .dapm_widgets = dac33_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(dac33_dapm_widgets),
-       .dapm_routes = audio_map,
-       .num_dapm_routes = ARRAY_SIZE(audio_map),
+       .component_driver = {
+               .controls               = dac33_snd_controls,
+               .num_controls           = ARRAY_SIZE(dac33_snd_controls),
+               .dapm_widgets           = dac33_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(dac33_dapm_widgets),
+               .dapm_routes            = audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(audio_map),
+       },
 };
 
 #define DAC33_RATES    (SNDRV_PCM_RATE_44100 | \
-- 
1.9.1

Reply via email to