]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: Remove unused dapm_get_snd_card() and dapm_get_soc_card()
authorLars-Peter Clausen <lars@metafoo.de>
Tue, 23 Jul 2013 09:12:25 +0000 (11:12 +0200)
committerMark Brown <broonie@linaro.org>
Tue, 23 Jul 2013 12:56:03 +0000 (13:56 +0100)
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>
sound/soc/soc-dapm.c

index b94190820e8cfa1b6c24e925f176196cc5efff98..93ea5d9fe356b7e1ec0a7bbc0be63910aa878cbc 100644 (file)
@@ -174,36 +174,6 @@ static inline struct snd_soc_dapm_widget *dapm_cnew_widget(
        return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL);
 }
 
-/* get snd_card from DAPM context */
-static inline struct snd_card *dapm_get_snd_card(
-       struct snd_soc_dapm_context *dapm)
-{
-       if (dapm->codec)
-               return dapm->codec->card->snd_card;
-       else if (dapm->platform)
-               return dapm->platform->card->snd_card;
-       else
-               BUG();
-
-       /* unreachable */
-       return NULL;
-}
-
-/* get soc_card from DAPM context */
-static inline struct snd_soc_card *dapm_get_soc_card(
-               struct snd_soc_dapm_context *dapm)
-{
-       if (dapm->codec)
-               return dapm->codec->card;
-       else if (dapm->platform)
-               return dapm->platform->card;
-       else
-               BUG();
-
-       /* unreachable */
-       return NULL;
-}
-
 static void dapm_reset(struct snd_soc_card *card)
 {
        struct snd_soc_dapm_widget *w;