diff options
| author | Kuninori Morimoto | 2016-08-08 11:28:43 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-08-08 12:57:57 +0200 |
| commit | bd22e11e1b48c088472bc1e91c8ee3a484eaf428 (patch) | |
| tree | ae61ae13cdc6f9e43d57398f1bd14c3f8248db57 /sound/soc/codecs/wm2000.c | |
| parent | ASoC: codec duplicated callback function goes to component on wm1250-ev1 (diff) | |
| download | kernel-qcow2-linux-bd22e11e1b48c088472bc1e91c8ee3a484eaf428.tar.gz kernel-qcow2-linux-bd22e11e1b48c088472bc1e91c8ee3a484eaf428.tar.xz kernel-qcow2-linux-bd22e11e1b48c088472bc1e91c8ee3a484eaf428.zip | |
ASoC: codec duplicated callback function goes to component on wm2000
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/wm2000.c')
| -rw-r--r-- | sound/soc/codecs/wm2000.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index a67ea10f41a1..1ebaf99a1907 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -805,12 +805,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm2000 = { .suspend = wm2000_suspend, .resume = wm2000_resume, - .dapm_widgets = wm2000_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm2000_dapm_widgets), - .dapm_routes = wm2000_audio_map, - .num_dapm_routes = ARRAY_SIZE(wm2000_audio_map), - .controls = wm2000_controls, - .num_controls = ARRAY_SIZE(wm2000_controls), + .component_driver = { + .controls = wm2000_controls, + .num_controls = ARRAY_SIZE(wm2000_controls), + .dapm_widgets = wm2000_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm2000_dapm_widgets), + .dapm_routes = wm2000_audio_map, + .num_dapm_routes = ARRAY_SIZE(wm2000_audio_map), + }, }; static int wm2000_i2c_probe(struct i2c_client *i2c, |