summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-08-08 09:25:22 +0000
committerMark Brown <broonie@kernel.org>2016-08-08 11:57:57 +0100
commit70e710d649ce705910885617fda3e37528057300 (patch)
treec2faf6a09a858c1f99143b4eb767c1235d1b40f4
parent29926fc8e853b6ddfee916d91fe88bec07058107 (diff)
downloadtalos-op-linux-70e710d649ce705910885617fda3e37528057300.tar.gz
talos-op-linux-70e710d649ce705910885617fda3e37528057300.zip
ASoC: codec duplicated callback function goes to component on stac9766
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/stac9766.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c
index 0945c51df003..2c5941f3a234 100644
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -320,8 +320,10 @@ static int stac9766_codec_remove(struct snd_soc_codec *codec)
}
static struct snd_soc_codec_driver soc_codec_dev_stac9766 = {
- .controls = stac9766_snd_ac97_controls,
- .num_controls = ARRAY_SIZE(stac9766_snd_ac97_controls),
+ .component_driver = {
+ .controls = stac9766_snd_ac97_controls,
+ .num_controls = ARRAY_SIZE(stac9766_snd_ac97_controls),
+ },
.write = stac9766_ac97_write,
.read = stac9766_ac97_read,
.set_bias_level = stac9766_set_bias_level,
OpenPOWER on IntegriCloud