diff options
| author | Kuninori Morimoto | 2016-08-08 11:11:55 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-08-08 12:57:57 +0200 |
| commit | ef611e1f4ad7c0355a2aa97660210bfa4a4472c4 (patch) | |
| tree | 60393c39145b6f18018af4e8ff20e5767be39c52 /sound/soc/codecs/adau1977.c | |
| parent | ASoC: codec duplicated callback function goes to component on adau1781 (diff) | |
| download | kernel-qcow2-linux-ef611e1f4ad7c0355a2aa97660210bfa4a4472c4.tar.gz kernel-qcow2-linux-ef611e1f4ad7c0355a2aa97660210bfa4a4472c4.tar.xz kernel-qcow2-linux-ef611e1f4ad7c0355a2aa97660210bfa4a4472c4.zip | |
ASoC: codec duplicated callback function goes to component on adau1977
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/adau1977.c')
| -rw-r--r-- | sound/soc/codecs/adau1977.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/adau1977.c b/sound/soc/codecs/adau1977.c index 9bdd15f408c1..b319db6a69f8 100644 --- a/sound/soc/codecs/adau1977.c +++ b/sound/soc/codecs/adau1977.c @@ -873,12 +873,14 @@ static struct snd_soc_codec_driver adau1977_codec_driver = { .set_sysclk = adau1977_set_sysclk, .idle_bias_off = true, - .controls = adau1977_snd_controls, - .num_controls = ARRAY_SIZE(adau1977_snd_controls), - .dapm_widgets = adau1977_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(adau1977_dapm_widgets), - .dapm_routes = adau1977_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(adau1977_dapm_routes), + .component_driver = { + .controls = adau1977_snd_controls, + .num_controls = ARRAY_SIZE(adau1977_snd_controls), + .dapm_widgets = adau1977_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(adau1977_dapm_widgets), + .dapm_routes = adau1977_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(adau1977_dapm_routes), + }, }; static int adau1977_setup_micbias(struct adau1977 *adau1977) |