diff options
author | Liam Girdwood <lrg@ti.com> | 2011-07-20 07:23:33 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-20 16:15:51 -0400 |
commit | 4805608ac1d1a60ca926ff81b1ebd3145f7adf78 (patch) | |
tree | 72b8e433b56231e31648759b85991926c68dc450 /sound | |
parent | d7c3e9525ac8e898f1156a1f3a7c5038f6560186 (diff) |
ASoC: dapm - Add methods to retrieve snd_card and soc_card from dapm context.
In preparation for ASoC Dynamic PCM (AKA DSP) support.
Provide convenience methods to retrieve the soc_card or snd_card from a
DAPM context.
Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-dapm.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index fbfcda062839..7e15914b3633 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -124,6 +124,36 @@ static inline struct snd_soc_dapm_widget *dapm_cnew_widget( | |||
124 | return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL); | 124 | return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL); |
125 | } | 125 | } |
126 | 126 | ||
127 | /* get snd_card from DAPM context */ | ||
128 | static inline struct snd_card *dapm_get_snd_card( | ||
129 | struct snd_soc_dapm_context *dapm) | ||
130 | { | ||
131 | if (dapm->codec) | ||
132 | return dapm->codec->card->snd_card; | ||
133 | else if (dapm->platform) | ||
134 | return dapm->platform->card->snd_card; | ||
135 | else | ||
136 | BUG(); | ||
137 | |||
138 | /* unreachable */ | ||
139 | return NULL; | ||
140 | } | ||
141 | |||
142 | /* get soc_card from DAPM context */ | ||
143 | static inline struct snd_soc_card *dapm_get_soc_card( | ||
144 | struct snd_soc_dapm_context *dapm) | ||
145 | { | ||
146 | if (dapm->codec) | ||
147 | return dapm->codec->card; | ||
148 | else if (dapm->platform) | ||
149 | return dapm->platform->card; | ||
150 | else | ||
151 | BUG(); | ||
152 | |||
153 | /* unreachable */ | ||
154 | return NULL; | ||
155 | } | ||
156 | |||
127 | static int soc_widget_read(struct snd_soc_dapm_widget *w, int reg) | 157 | static int soc_widget_read(struct snd_soc_dapm_widget *w, int reg) |
128 | { | 158 | { |
129 | if (w->codec) | 159 | if (w->codec) |