siox: Provide a devm variant of siox_master_alloc()

This allows to simplify siox master drivers in the next step.

Acked-by: Thorsten Scherer <t.scherer@eckelmann.de>
Link: https://lore.kernel.org/r/ad141dd22c7d95ad0bd347f257ce586e1afb22a4.1708328466.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --git a/drivers/siox/siox-core.c b/drivers/siox/siox-core.c
index d4acab7036d66ba927009596063009efb1dc1d9f..86ce2f3cde919c670d631ae0d641401762cafdeb 100644 (file)
--- a/drivers/siox/siox-core.c
+++ b/drivers/siox/siox-core.c
@@ -707,6 +707,31 @@ struct siox_master *siox_master_alloc(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(siox_master_alloc);
 
+static void devm_siox_master_put(void *data)
+{
+       struct siox_master *smaster = data;
+
+       siox_master_put(smaster);
+}
+
+struct siox_master *devm_siox_master_alloc(struct device *dev,
+                                          size_t size)
+{
+       struct siox_master *smaster;
+       int ret;
+
+       smaster = siox_master_alloc(dev, size);
+       if (!smaster)
+               return NULL;
+
+       ret = devm_add_action_or_reset(dev, devm_siox_master_put, smaster);
+       if (ret)
+               return NULL;
+
+       return smaster;
+}
+EXPORT_SYMBOL_GPL(devm_siox_master_alloc);
+
 int siox_master_register(struct siox_master *smaster)
 {
        int ret;

diff --git a/drivers/siox/siox.h b/drivers/siox/siox.h
index f08b43b713c5cdd2f01904646d7bfc85a81e496c..b227e18b697a43b308719388fe8e2c8b9bdcc7b2 100644 (file)
--- a/drivers/siox/siox.h
+++ b/drivers/siox/siox.h
@@ -45,5 +45,7 @@ static inline void siox_master_put(struct siox_master *smaster)
        put_device(&smaster->dev);
 }
 
+struct siox_master *devm_siox_master_alloc(struct device *dev, size_t size);
+
 int siox_master_register(struct siox_master *smaster);
 void siox_master_unregister(struct siox_master *smaster);