devm: add helper devm_add_action_or_reset()

Add a helper function devm_add_action_or_reset() which will internally
call devm_add_action(). But if devm_add_action() fails then it will
execute the action mentioned and return the error code.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

diff --git a/include/linux/device.h b/include/linux/device.h
index 6d6f1fec092fe5df78671f5b352931a2edae4aca..74674e0983158e35006b59f2eda058478ce4917c 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -682,6 +682,18 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
 int devm_add_action(struct device *dev, void (*action)(void *), void *data);
 void devm_remove_action(struct device *dev, void (*action)(void *), void *data);
 
+static inline int devm_add_action_or_reset(struct device *dev,
+                                          void (*action)(void *), void *data)
+{
+       int ret;
+
+       ret = devm_add_action(dev, action, data);
+       if (ret)
+               action(data);
+
+       return ret;
+}
+
 struct device_dma_parameters {
        /*
         * a low level driver may set these to teach IOMMU code about