diff options
-rw-r--r-- | sound/soc/soc-topology.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 0eb01e8155f1..07f61a67aef6 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c | |||
@@ -223,51 +223,6 @@ static int get_widget_id(int tplg_type) | |||
223 | return -EINVAL; | 223 | return -EINVAL; |
224 | } | 224 | } |
225 | 225 | ||
226 | static enum snd_soc_dobj_type get_dobj_mixer_type( | ||
227 | struct snd_soc_tplg_ctl_hdr *control_hdr) | ||
228 | { | ||
229 | if (control_hdr == NULL) | ||
230 | return SND_SOC_DOBJ_NONE; | ||
231 | |||
232 | switch (control_hdr->ops.info) { | ||
233 | case SND_SOC_TPLG_CTL_VOLSW: | ||
234 | case SND_SOC_TPLG_CTL_VOLSW_SX: | ||
235 | case SND_SOC_TPLG_CTL_VOLSW_XR_SX: | ||
236 | case SND_SOC_TPLG_CTL_RANGE: | ||
237 | case SND_SOC_TPLG_CTL_STROBE: | ||
238 | return SND_SOC_DOBJ_MIXER; | ||
239 | case SND_SOC_TPLG_CTL_ENUM: | ||
240 | case SND_SOC_TPLG_CTL_ENUM_VALUE: | ||
241 | return SND_SOC_DOBJ_ENUM; | ||
242 | case SND_SOC_TPLG_CTL_BYTES: | ||
243 | return SND_SOC_DOBJ_BYTES; | ||
244 | default: | ||
245 | return SND_SOC_DOBJ_NONE; | ||
246 | } | ||
247 | } | ||
248 | |||
249 | static enum snd_soc_dobj_type get_dobj_type(struct snd_soc_tplg_hdr *hdr, | ||
250 | struct snd_soc_tplg_ctl_hdr *control_hdr) | ||
251 | { | ||
252 | switch (hdr->type) { | ||
253 | case SND_SOC_TPLG_TYPE_MIXER: | ||
254 | return get_dobj_mixer_type(control_hdr); | ||
255 | case SND_SOC_TPLG_TYPE_DAPM_GRAPH: | ||
256 | case SND_SOC_TPLG_TYPE_MANIFEST: | ||
257 | return SND_SOC_DOBJ_NONE; | ||
258 | case SND_SOC_TPLG_TYPE_DAPM_WIDGET: | ||
259 | return SND_SOC_DOBJ_WIDGET; | ||
260 | case SND_SOC_TPLG_TYPE_DAI_LINK: | ||
261 | return SND_SOC_DOBJ_DAI_LINK; | ||
262 | case SND_SOC_TPLG_TYPE_PCM: | ||
263 | return SND_SOC_DOBJ_PCM; | ||
264 | case SND_SOC_TPLG_TYPE_CODEC_LINK: | ||
265 | return SND_SOC_DOBJ_CODEC_LINK; | ||
266 | default: | ||
267 | return SND_SOC_DOBJ_NONE; | ||
268 | } | ||
269 | } | ||
270 | |||
271 | static inline void soc_bind_err(struct soc_tplg *tplg, | 226 | static inline void soc_bind_err(struct soc_tplg *tplg, |
272 | struct snd_soc_tplg_ctl_hdr *hdr, int index) | 227 | struct snd_soc_tplg_ctl_hdr *hdr, int index) |
273 | { | 228 | { |