summaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-08-08 09:10:21 +0000
committerMark Brown <broonie@kernel.org>2016-08-08 11:57:57 +0100
commit69295df090a03e406c54ca0dbd67a76355773138 (patch)
treefc1474b2df744efb2eb6cb389198609cae034f51 /sound/soc/atmel
parent33398b509aafe936ec57cb1023f7ff1ba9e48586 (diff)
downloadlinux-69295df090a03e406c54ca0dbd67a76355773138.tar.gz
linux-69295df090a03e406c54ca0dbd67a76355773138.tar.bz2
linux-69295df090a03e406c54ca0dbd67a76355773138.zip
ASoC: codec duplicated callback function goes to component on atmel-classd
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/atmel')
-rw-r--r--sound/soc/atmel/atmel-classd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index 6d9b8b44e2da..89ac5f5a93eb 100644
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -308,9 +308,11 @@ static struct regmap *atmel_classd_codec_get_remap(struct device *dev)
static struct snd_soc_codec_driver soc_codec_dev_classd = {
.probe = atmel_classd_codec_probe,
- .controls = atmel_classd_snd_controls,
- .num_controls = ARRAY_SIZE(atmel_classd_snd_controls),
.get_regmap = atmel_classd_codec_get_remap,
+ .component_driver = {
+ .controls = atmel_classd_snd_controls,
+ .num_controls = ARRAY_SIZE(atmel_classd_snd_controls),
+ },
};
/* codec dai component */