diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 12:24:04 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 12:24:04 +0200 |
| commit | 48ce3ec16a618de7fbeb8c3462f8022984f53a1d (patch) | |
| tree | 89ce6a3b0520fc98e933342acca1076fe669feaa /include/sound | |
| parent | Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next (diff) | |
| parent | ASoC: fsl: imx-sgtl5000: Add .remove back (diff) | |
| download | linux-48ce3ec16a618de7fbeb8c3462f8022984f53a1d.tar.xz linux-48ce3ec16a618de7fbeb8c3462f8022984f53a1d.zip | |
Merge remote-tracking branch 'asoc/topic/devm' into asoc-next
Diffstat (limited to 'include/sound')
| -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 e25416445bd7..1f741cb24f33 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); |