diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-08 08:53:08 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-08 11:57:57 +0100 |
| commit | 786e3a480fa9e04b36191a2529cabfec3e30ad9c (patch) | |
| tree | 8c62f1aff622aac39d47e7d0c1f57e44e24fccee | |
| parent | 42c889233d8d5e075fdf8a2643a4ca69a9807075 (diff) | |
| download | op-kernel-dev-786e3a480fa9e04b36191a2529cabfec3e30ad9c.zip op-kernel-dev-786e3a480fa9e04b36191a2529cabfec3e30ad9c.tar.gz | |
ASoC: codec duplicated callback function goes to component on tlv320aic3x
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/tlv320aic3x.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index a564759..5a8d96e 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1670,12 +1670,14 @@ static struct snd_soc_codec_driver soc_codec_dev_aic3x = { .idle_bias_off = true, .probe = aic3x_probe, .remove = aic3x_remove, - .controls = aic3x_snd_controls, - .num_controls = ARRAY_SIZE(aic3x_snd_controls), - .dapm_widgets = aic3x_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(aic3x_dapm_widgets), - .dapm_routes = intercon, - .num_dapm_routes = ARRAY_SIZE(intercon), + .component_driver = { + .controls = aic3x_snd_controls, + .num_controls = ARRAY_SIZE(aic3x_snd_controls), + .dapm_widgets = aic3x_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(aic3x_dapm_widgets), + .dapm_routes = intercon, + .num_dapm_routes = ARRAY_SIZE(intercon), + }, }; /* |
