summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-08-08 11:25:03 +0200
committerMark Brown <broonie@kernel.org>2016-08-08 12:57:57 +0200
commit29926fc8e853b6ddfee916d91fe88bec07058107 (patch)
tree9b667dd1d23e2ca0dbd75859404d1e86ba8a5a6a /sound/soc
parentASoC: codec duplicated callback function goes to component on ssm2518 (diff)
downloadlinux-29926fc8e853b6ddfee916d91fe88bec07058107.tar.xz
linux-29926fc8e853b6ddfee916d91fe88bec07058107.zip
ASoC: codec duplicated callback function goes to component on sta529
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')
-rw-r--r--sound/soc/codecs/sta529.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index 2cdaca943a8c..d4b384e4b266 100644
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -317,8 +317,10 @@ static const struct snd_soc_codec_driver sta529_codec_driver = {
.set_bias_level = sta529_set_bias_level,
.suspend_bias_off = true,
- .controls = sta529_snd_controls,
- .num_controls = ARRAY_SIZE(sta529_snd_controls),
+ .component_driver = {
+ .controls = sta529_snd_controls,
+ .num_controls = ARRAY_SIZE(sta529_snd_controls),
+ },
};
static const struct regmap_config sta529_regmap = {