diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-08 09:02:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-08 11:57:57 +0100 |
| commit | 951cd7e6ffda4dc86ed6fb6ff10e0ca8f3b67c2b (patch) | |
| tree | ac6a5817115914c9456e7535eb9f98fa8cea4364 /sound/soc/codecs/cs42l73.c | |
| parent | 4d7ee73707ec0b3759039a1d573f7829f94046e7 (diff) | |
| download | linux-951cd7e6ffda4dc86ed6fb6ff10e0ca8f3b67c2b.tar.bz2 | |
ASoC: codec duplicated callback function goes to component on cs42l73
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>
Diffstat (limited to 'sound/soc/codecs/cs42l73.c')
| -rw-r--r-- | sound/soc/codecs/cs42l73.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 42a8fd4e1f9b..01b573ab7036 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -1257,13 +1257,14 @@ static const struct snd_soc_codec_driver soc_codec_dev_cs42l73 = { .set_bias_level = cs42l73_set_bias_level, .suspend_bias_off = true, - .dapm_widgets = cs42l73_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(cs42l73_dapm_widgets), - .dapm_routes = cs42l73_audio_map, - .num_dapm_routes = ARRAY_SIZE(cs42l73_audio_map), - - .controls = cs42l73_snd_controls, - .num_controls = ARRAY_SIZE(cs42l73_snd_controls), + .component_driver = { + .controls = cs42l73_snd_controls, + .num_controls = ARRAY_SIZE(cs42l73_snd_controls), + .dapm_widgets = cs42l73_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs42l73_dapm_widgets), + .dapm_routes = cs42l73_audio_map, + .num_dapm_routes = ARRAY_SIZE(cs42l73_audio_map), + }, }; static const struct regmap_config cs42l73_regmap = { |