Merge tag 'upstream-3.16-rc1-v2' of git://git.infradead.org/linux-ubifs

[firefly-linux-kernel-4.4.55.git] / sound / soc / soc-devres.c

diff --git a/sound/soc/soc-devres.c b/sound/soc/soc-devres.c
index 7ac745df1412689c6adf0bf246399870b79e44e7..057e5ef7dcce6730bdc99bc8e5719ebe458669d0 100644 (file)
--- a/sound/soc/soc-devres.c
+++ b/sound/soc/soc-devres.c
@@ -52,6 +52,41 @@ int devm_snd_soc_register_component(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(devm_snd_soc_register_component);
 
+static void devm_platform_release(struct device *dev, void *res)
+{
+       snd_soc_unregister_platform(*(struct device **)res);
+}
+
+/**
+ * devm_snd_soc_register_platform - resource managed platform registration
+ * @dev: Device used to manage platform
+ * @platform: platform to register
+ *
+ * Register a platform driver with automatic unregistration when the device is
+ * unregistered.
+ */
+int devm_snd_soc_register_platform(struct device *dev,
+                       const struct snd_soc_platform_driver *platform_drv)
+{
+       struct device **ptr;
+       int ret;
+
+       ptr = devres_alloc(devm_platform_release, sizeof(*ptr), GFP_KERNEL);
+       if (!ptr)
+               return -ENOMEM;
+
+       ret = snd_soc_register_platform(dev, platform_drv);
+       if (ret == 0) {
+               *ptr = dev;
+               devres_add(dev, ptr);
+       } else {
+               devres_free(ptr);
+       }
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(devm_snd_soc_register_platform);
+
 static void devm_card_release(struct device *dev, void *res)
 {
        snd_soc_unregister_card(*(struct snd_soc_card **)res);