diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-29 18:40:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-29 18:40:55 +0100 |
| commit | 60529c65ec3bc1a347f67eec1b1567efebbf7ce1 (patch) | |
| tree | b0306d615dc7fa791030fd8348706ed66c3c08d8 /sound/soc/soc-dapm.c | |
| parent | 5d99d778495cb02eafd38292f462c4466fc7189f (diff) | |
| parent | 5f6e7d52c4959019d12a7deebbde548884a917d1 (diff) | |
| download | talos-obmc-linux-60529c65ec3bc1a347f67eec1b1567efebbf7ce1.tar.gz talos-obmc-linux-60529c65ec3bc1a347f67eec1b1567efebbf7ce1.zip | |
Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dapm
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 758761146a42..366daef006ed 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( 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; |
