diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-12 21:48:31 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-12 21:48:31 +0300 |
| commit | 77b62fa5d23988155132cf7fee44f2c209e3dc4c (patch) | |
| tree | 41cafd1b209f115a3c97939e1a566c69d4c58a01 /include | |
| parent | d1113af4e8c0f2cd71e52cb904447bd0eec8aa54 (diff) | |
| parent | 6b5b042d4c675cb9d3446a1cdcaca98e715ba812 (diff) | |
| download | linux-77b62fa5d23988155132cf7fee44f2c209e3dc4c.tar.xz | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dapm.h | 1 | ||||
| -rw-r--r-- | include/sound/soc.h | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 485fc9d1a7bc..d3a76b55186c 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -440,7 +440,6 @@ void dapm_mark_endpoints_dirty(struct snd_soc_card *card); 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_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol); struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm( struct snd_kcontrol *kcontrol); diff --git a/include/sound/soc.h b/include/sound/soc.h index bc6cfabc0e35..92b92ac120bb 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1268,6 +1268,19 @@ static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm( return component->dapm_ptr; } +/** + * snd_soc_dapm_kcontrol_codec() - Returns the codec associated to a kcontrol + * @kcontrol: The kcontrol + * + * This function must only be used on DAPM contexts that are known to be part of + * a CODEC (e.g. in a CODEC driver). Otherwise the behavior is undefined. + */ +static inline struct snd_soc_codec *snd_soc_dapm_kcontrol_codec( + struct snd_kcontrol *kcontrol) +{ + return snd_soc_dapm_to_codec(snd_soc_dapm_kcontrol_dapm(kcontrol)); +} + /* codec IO */ unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg); int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg, |