summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2017-08-25 02:29:01 +0200
committerMark Brown <broonie@kernel.org>2017-08-25 15:58:44 +0200
commitb8972bf0521ca7ee3c8d27da0fd101fe648acfc2 (patch)
tree5c29c9f54fc2551af76efc41fd318710dc18a232 /include
parentASoC: soc-core: remove duplicate mutex_unlock from snd_soc_unregister_compone... (diff)
downloadlinux-b8972bf0521ca7ee3c8d27da0fd101fe648acfc2.tar.xz
linux-b8972bf0521ca7ee3c8d27da0fd101fe648acfc2.zip
ASoC: remove duplicate definition of controls/num_controls
snd_soc_component and snd_soc_component_driver both have controls/num_controls, but these are duplicated. Let's remove duplicated definition. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index de57a8ad057b..e4b4746032ba 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -862,8 +862,6 @@ struct snd_soc_component {
/* Don't use these, use snd_soc_component_get_dapm() */
struct snd_soc_dapm_context dapm;
- const struct snd_kcontrol_new *controls;
- unsigned int num_controls;
const struct snd_soc_dapm_widget *dapm_widgets;
unsigned int num_dapm_widgets;
const struct snd_soc_dapm_route *dapm_routes;