aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-07-23 05:12:25 -0400
committerMark Brown <broonie@linaro.org>2013-07-23 08:56:03 -0400
commit5f6e7d52c4959019d12a7deebbde548884a917d1 (patch)
tree10e9f9a54f7d9378b0a8ca61ee76a5360a888b25
parente6058aaadcd473e5827720dc143af56aabbeecc7 (diff)
ASoC: Remove unused dapm_get_snd_card() and dapm_get_soc_card()
These two functions were added two years ago in commit 4805608 ("ASoC: dapm - Add methods to retrieve snd_card and soc_card from dapm context.") but have remained unused so far. Considering that the dapm context actually has a direct pointer to the card the functions also seem to be unnecessary. E.g. the expressions 'dapm_get_soc_card(dapm)' and 'dapm->card' yield the same result. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/soc-dapm.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index b94190820e8c..93ea5d9fe356 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -174,36 +174,6 @@ static inline struct snd_soc_dapm_widget *dapm_cnew_widget(
174 return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL); 174 return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL);
175} 175}
176 176
177/* get snd_card from DAPM context */
178static inline struct snd_card *dapm_get_snd_card(
179 struct snd_soc_dapm_context *dapm)
180{
181 if (dapm->codec)
182 return dapm->codec->card->snd_card;
183 else if (dapm->platform)
184 return dapm->platform->card->snd_card;
185 else
186 BUG();
187
188 /* unreachable */
189 return NULL;
190}
191
192/* get soc_card from DAPM context */
193static inline struct snd_soc_card *dapm_get_soc_card(
194 struct snd_soc_dapm_context *dapm)
195{
196 if (dapm->codec)
197 return dapm->codec->card;
198 else if (dapm->platform)
199 return dapm->platform->card;
200 else
201 BUG();
202
203 /* unreachable */
204 return NULL;
205}
206
207static void dapm_reset(struct snd_soc_card *card) 177static void dapm_reset(struct snd_soc_card *card)
208{ 178{
209 struct snd_soc_dapm_widget *w; 179 struct snd_soc_dapm_widget *w;