diff options
| author | Kuninori Morimoto | 2016-08-08 11:21:02 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-08-08 12:57:57 +0200 |
| commit | 4cd747df40c6dfdc61daf22b6457904a3d87213a (patch) | |
| tree | 9e27c98c314333fa7e7a356802c97d9d7d8cb117 | |
| parent | ASoC: codec duplicated callback function goes to component on nau8825 (diff) | |
| download | kernel-qcow2-linux-4cd747df40c6dfdc61daf22b6457904a3d87213a.tar.gz kernel-qcow2-linux-4cd747df40c6dfdc61daf22b6457904a3d87213a.tar.xz kernel-qcow2-linux-4cd747df40c6dfdc61daf22b6457904a3d87213a.zip | |
ASoC: codec duplicated callback function goes to component on pcm3008
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/pcm3008.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c index 8fb445f33f6f..708af05486f6 100644 --- a/sound/soc/codecs/pcm3008.c +++ b/sound/soc/codecs/pcm3008.c @@ -99,10 +99,12 @@ static struct snd_soc_dai_driver pcm3008_dai = { }; static struct snd_soc_codec_driver soc_codec_dev_pcm3008 = { - .dapm_widgets = pcm3008_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(pcm3008_dapm_widgets), - .dapm_routes = pcm3008_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(pcm3008_dapm_routes), + .component_driver = { + .dapm_widgets = pcm3008_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(pcm3008_dapm_widgets), + .dapm_routes = pcm3008_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(pcm3008_dapm_routes), + }, }; static int pcm3008_codec_probe(struct platform_device *pdev) |