ASoC: Add resource managed snd_soc_register_platform()

Simplify error handling and remove repetitive (and rarely executed) code
for unregistration by providing a devm_snd_soc_register_platform()
platform.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 8931bf6208776292b1b888dd8534229f63e2eaa2)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index c4be7ab893997d2053439dca977cd2f220d1d297..59a47851f5c8be330f0e818309613f4872018529 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -383,6 +383,8 @@ int snd_soc_resume(struct device *dev);
 int snd_soc_poweroff(struct device *dev);
 int snd_soc_register_platform(struct device *dev,
                const struct snd_soc_platform_driver *platform_drv);
+int devm_snd_soc_register_platform(struct device *dev,
+               const struct snd_soc_platform_driver *platform_drv);
 void snd_soc_unregister_platform(struct device *dev);
 int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
                const struct snd_soc_platform_driver *platform_drv);

diff --git a/sound/soc/soc-devres.c b/sound/soc/soc-devres.c
index 7ac745df1412689c6adf0bf246399870b79e44e7..e94aa0277250bb45dfce46338c81daa8d2ba1b32 100644 (file)
--- a/sound/soc/soc-devres.c
+++ b/sound/soc/soc-devres.c
@@ -52,6 +52,40 @@ 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;
+}
+
 static void devm_card_release(struct device *dev, void *res)
 {
        snd_soc_unregister_card(*(struct snd_soc_card **)res);