diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-10-27 03:37:08 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-10-27 03:37:08 -0400 |
commit | 911fc25dda145f4f7313535466eec0c9f4a51ea1 (patch) | |
tree | 66b5c22cd19cea6597900b37b7dbdeb5623b8799 /sound/soc/soc-dapm.c | |
parent | 4b7d283150b35db6e5e10f72606f603ff424c92a (diff) | |
parent | 6b9331165e9827e055389e22d1cbdb5fe3cff835 (diff) |
Merge branch 'topic/asoc-next' into topic/asoc
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r-- | sound/soc/soc-dapm.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 7351db9606e4..7e9f423f5b09 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -1007,28 +1007,6 @@ err: | |||
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | /** | 1009 | /** |
1010 | * snd_soc_dapm_connect_input - connect dapm widgets | ||
1011 | * @codec: audio codec | ||
1012 | * @sink: name of target widget | ||
1013 | * @control: mixer control name | ||
1014 | * @source: name of source name | ||
1015 | * | ||
1016 | * Connects 2 dapm widgets together via a named audio path. The sink is | ||
1017 | * the widget receiving the audio signal, whilst the source is the sender | ||
1018 | * of the audio signal. | ||
1019 | * | ||
1020 | * This function has been deprecated in favour of snd_soc_dapm_add_routes(). | ||
1021 | * | ||
1022 | * Returns 0 for success else error. | ||
1023 | */ | ||
1024 | int snd_soc_dapm_connect_input(struct snd_soc_codec *codec, const char *sink, | ||
1025 | const char *control, const char *source) | ||
1026 | { | ||
1027 | return snd_soc_dapm_add_route(codec, sink, control, source); | ||
1028 | } | ||
1029 | EXPORT_SYMBOL_GPL(snd_soc_dapm_connect_input); | ||
1030 | |||
1031 | /** | ||
1032 | * snd_soc_dapm_add_routes - Add routes between DAPM widgets | 1010 | * snd_soc_dapm_add_routes - Add routes between DAPM widgets |
1033 | * @codec: codec | 1011 | * @codec: codec |
1034 | * @route: audio routes | 1012 | * @route: audio routes |