summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/inno_rk3036.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-08-08 09:00:54 +0000
committerMark Brown <broonie@kernel.org>2016-08-08 11:57:57 +0100
commitf410a81d4d5fd4d0e9477c5d7ebd4e6712ed4c42 (patch)
tree3815c4aedede4c47e811a90cfe492299ff89a5d1 /sound/soc/codecs/inno_rk3036.c
parent750a33e6173c5ac5f202f15bb092eb4965f4547d (diff)
downloadlinux-stable-f410a81d4d5fd4d0e9477c5d7ebd4e6712ed4c42.tar.gz
linux-stable-f410a81d4d5fd4d0e9477c5d7ebd4e6712ed4c42.tar.bz2
linux-stable-f410a81d4d5fd4d0e9477c5d7ebd4e6712ed4c42.zip
ASoC: codec duplicated callback function goes to component on inno_rk3036
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/codecs/inno_rk3036.c')
-rw-r--r--sound/soc/codecs/inno_rk3036.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/inno_rk3036.c b/sound/soc/codecs/inno_rk3036.c
index 9b6e8840a1b5..b918ba5c8ce5 100644
--- a/sound/soc/codecs/inno_rk3036.c
+++ b/sound/soc/codecs/inno_rk3036.c
@@ -380,12 +380,14 @@ static struct snd_soc_codec_driver rk3036_codec_driver = {
.probe = rk3036_codec_probe,
.remove = rk3036_codec_remove,
.set_bias_level = rk3036_codec_set_bias_level,
- .controls = rk3036_codec_dapm_controls,
- .num_controls = ARRAY_SIZE(rk3036_codec_dapm_controls),
- .dapm_routes = rk3036_codec_dapm_routes,
- .num_dapm_routes = ARRAY_SIZE(rk3036_codec_dapm_routes),
- .dapm_widgets = rk3036_codec_dapm_widgets,
- .num_dapm_widgets = ARRAY_SIZE(rk3036_codec_dapm_widgets),
+ .component_driver = {
+ .controls = rk3036_codec_dapm_controls,
+ .num_controls = ARRAY_SIZE(rk3036_codec_dapm_controls),
+ .dapm_routes = rk3036_codec_dapm_routes,
+ .num_dapm_routes = ARRAY_SIZE(rk3036_codec_dapm_routes),
+ .dapm_widgets = rk3036_codec_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(rk3036_codec_dapm_widgets),
+ },
};
static const struct regmap_config rk3036_codec_regmap_config = {