Merge tag 'pm+acpi-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[deliverable/linux.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 88192d098aed6656db545770cd3ca597ea261e1f..002c59728dbe6012c5eac53c3f6a1eb885b8af05 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -685,6 +685,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