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/si476x.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c
index a8402d0..5344f4a 100644
--- a/sound/soc/codecs/si476x.c
+++ b/sound/soc/codecs/si476x.c
@@ -238,10 +238,12 @@ static struct regmap *si476x_get_regmap(struct device 
*dev)
 
 static struct snd_soc_codec_driver soc_codec_dev_si476x = {
        .get_regmap = si476x_get_regmap,
-       .dapm_widgets = si476x_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets),
-       .dapm_routes = si476x_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(si476x_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = si476x_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(si476x_dapm_widgets),
+               .dapm_routes            = si476x_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(si476x_dapm_routes),
+       },
 };
 
 static int si476x_platform_probe(struct platform_device *pdev)
-- 
1.9.1

Reply via email to