diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-08 05:28:25 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-08-08 06:57:57 -0400 |
commit | c6c0a214001ecc6c5d42c1226cdd33c07f8a016b (patch) | |
tree | 57cd23cde24da51f05ba970077f4c22073128c77 | |
parent | 022f86d6f3b15bcd4865bccf837d309eb336f5a2 (diff) |
ASoC: codec duplicated callback function goes to component on wm1250-ev1
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>
-rw-r--r-- | sound/soc/codecs/wm1250-ev1.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm1250-ev1.c b/sound/soc/codecs/wm1250-ev1.c index ec45c5b220b1..caf501227265 100644 --- a/sound/soc/codecs/wm1250-ev1.c +++ b/sound/soc/codecs/wm1250-ev1.c | |||
@@ -142,11 +142,12 @@ static struct snd_soc_dai_driver wm1250_ev1_dai = { | |||
142 | }; | 142 | }; |
143 | 143 | ||
144 | static struct snd_soc_codec_driver soc_codec_dev_wm1250_ev1 = { | 144 | static struct snd_soc_codec_driver soc_codec_dev_wm1250_ev1 = { |
145 | .dapm_widgets = wm1250_ev1_dapm_widgets, | 145 | .component_driver = { |
146 | .num_dapm_widgets = ARRAY_SIZE(wm1250_ev1_dapm_widgets), | 146 | .dapm_widgets = wm1250_ev1_dapm_widgets, |
147 | .dapm_routes = wm1250_ev1_dapm_routes, | 147 | .num_dapm_widgets = ARRAY_SIZE(wm1250_ev1_dapm_widgets), |
148 | .num_dapm_routes = ARRAY_SIZE(wm1250_ev1_dapm_routes), | 148 | .dapm_routes = wm1250_ev1_dapm_routes, |
149 | 149 | .num_dapm_routes = ARRAY_SIZE(wm1250_ev1_dapm_routes), | |
150 | }, | ||
150 | .set_bias_level = wm1250_ev1_set_bias_level, | 151 | .set_bias_level = wm1250_ev1_set_bias_level, |
151 | .idle_bias_off = true, | 152 | .idle_bias_off = true, |
152 | }; | 153 | }; |