diff options
| author | Kuninori Morimoto | 2016-08-08 11:14:35 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-08-08 12:57:57 +0200 |
| commit | 57329a3a419273e765f5654c3c8cad9266c5b6f2 (patch) | |
| tree | ddd74de707fc0a2affa0b869de7f10dd7c6faabe | |
| parent | ASoC: codec duplicated callback function goes to component on cx20442 (diff) | |
| download | kernel-qcow2-linux-57329a3a419273e765f5654c3c8cad9266c5b6f2.tar.gz kernel-qcow2-linux-57329a3a419273e765f5654c3c8cad9266c5b6f2.tar.xz kernel-qcow2-linux-57329a3a419273e765f5654c3c8cad9266c5b6f2.zip | |
ASoC: codec duplicated callback function goes to component on da7210
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/da7210.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index af23a61b7b28..17053dfc94cf 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -1167,13 +1167,14 @@ static int da7210_probe(struct snd_soc_codec *codec) static struct snd_soc_codec_driver soc_codec_dev_da7210 = { .probe = da7210_probe, - .controls = da7210_snd_controls, - .num_controls = ARRAY_SIZE(da7210_snd_controls), - - .dapm_widgets = da7210_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(da7210_dapm_widgets), - .dapm_routes = da7210_audio_map, - .num_dapm_routes = ARRAY_SIZE(da7210_audio_map), + .component_driver = { + .controls = da7210_snd_controls, + .num_controls = ARRAY_SIZE(da7210_snd_controls), + .dapm_widgets = da7210_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(da7210_dapm_widgets), + .dapm_routes = da7210_audio_map, + .num_dapm_routes = ARRAY_SIZE(da7210_audio_map), + }, }; #if IS_ENABLED(CONFIG_I2C) |