summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-08-08 08:58:11 +0000
committerMark Brown <broonie@kernel.org>2016-08-08 11:57:57 +0100
commit35eeafe3bf90d969756c5ef0f996c052ef35959d (patch)
tree662b47e325c425709d6c1584b6377762ddc096a8
parentb9c990da5f258af36acc508f460356e47cd3cb14 (diff)
downloadop-kernel-dev-35eeafe3bf90d969756c5ef0f996c052ef35959d.zip
op-kernel-dev-35eeafe3bf90d969756c5ef0f996c052ef35959d.tar.gz
ASoC: codec duplicated callback function goes to component on spdif_receiver
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/spdif_receiver.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/spdif_receiver.c b/sound/soc/codecs/spdif_receiver.c
index 3ec41ccb..234f87b 100644
--- a/sound/soc/codecs/spdif_receiver.c
+++ b/sound/soc/codecs/spdif_receiver.c
@@ -38,10 +38,12 @@ static const struct snd_soc_dapm_route dir_routes[] = {
SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)
static struct snd_soc_codec_driver soc_codec_spdif_dir = {
- .dapm_widgets = dir_widgets,
- .num_dapm_widgets = ARRAY_SIZE(dir_widgets),
- .dapm_routes = dir_routes,
- .num_dapm_routes = ARRAY_SIZE(dir_routes),
+ .component_driver = {
+ .dapm_widgets = dir_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(dir_widgets),
+ .dapm_routes = dir_routes,
+ .num_dapm_routes = ARRAY_SIZE(dir_routes),
+ },
};
static struct snd_soc_dai_driver dir_stub_dai = {
OpenPOWER on IntegriCloud