summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-11-04 11:30:58 +0100
committerMark Brown <broonie@kernel.org>2014-11-04 12:53:53 +0100
commit313665b983fe30af9d0eb274f7e03276e05a1bbf (patch)
tree4593d35748f415e6b55ffb7e17ebc32c672f473a /sound/soc/soc-dapm.c
parentMerge branch 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff)
downloadlinux-313665b983fe30af9d0eb274f7e03276e05a1bbf.tar.xz
linux-313665b983fe30af9d0eb274f7e03276e05a1bbf.zip
ASoC: Remove card field from snd_soc_dai struct
The card field of the snd_soc_dai field is very rarely used. We can use dai->component->card instead and remove the card field from the snd_soc_dai struct. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 6bf2c9795df2..c5136bb1f982 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1043,7 +1043,7 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget,
int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
struct snd_soc_dapm_widget_list **list)
{
- struct snd_soc_card *card = dai->card;
+ struct snd_soc_card *card = dai->component->card;
struct snd_soc_dapm_widget *w;
int paths;