diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:27 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:27 +0000 |
| commit | 99a0ea2d5bbba87f3cfae7a1ac38846a678ee397 (patch) | |
| tree | 2ec02fae3a06c73057bb3abc0afb781ea812881e /include | |
| parent | ac97d4e00a8356e61806fe7b223c0b7021908577 (diff) | |
| parent | 4fa8dbc18e8a57ea21c63103abdea042ab923202 (diff) | |
Merge remote-tracking branch 'asoc/topic/devm' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 6ed3dc0773c..fbea72f9cc6 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -365,6 +365,7 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source, int snd_soc_register_card(struct snd_soc_card *card); int snd_soc_unregister_card(struct snd_soc_card *card); +int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card); int snd_soc_suspend(struct device *dev); int snd_soc_resume(struct device *dev); int snd_soc_poweroff(struct device *dev); @@ -382,6 +383,9 @@ void snd_soc_unregister_codec(struct device *dev); int snd_soc_register_component(struct device *dev, const struct snd_soc_component_driver *cmpnt_drv, struct snd_soc_dai_driver *dai_drv, int num_dai); +int devm_snd_soc_register_component(struct device *dev, + const struct snd_soc_component_driver *cmpnt_drv, + struct snd_soc_dai_driver *dai_drv, int num_dai); void snd_soc_unregister_component(struct device *dev); int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, unsigned int reg); |