Merge tag 'renesas-dt-fixes-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / kernel / reboot.c

diff --git a/kernel/reboot.c b/kernel/reboot.c
index bd30a973fe946b03916a1eeb873928adfe1b32b0..e4ced883d8de1ca9280fd18c43fafa4ce1c20e76 100644 (file)
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -104,6 +104,33 @@ int unregister_reboot_notifier(struct notifier_block *nb)
 }
 EXPORT_SYMBOL(unregister_reboot_notifier);
 
+static void devm_unregister_reboot_notifier(struct device *dev, void *res)
+{
+       WARN_ON(unregister_reboot_notifier(*(struct notifier_block **)res));
+}
+
+int devm_register_reboot_notifier(struct device *dev, struct notifier_block *nb)
+{
+       struct notifier_block **rcnb;
+       int ret;
+
+       rcnb = devres_alloc(devm_unregister_reboot_notifier,
+                           sizeof(*rcnb), GFP_KERNEL);
+       if (!rcnb)
+               return -ENOMEM;
+
+       ret = register_reboot_notifier(nb);
+       if (!ret) {
+               *rcnb = nb;
+               devres_add(dev, rcnb);
+       } else {
+               devres_free(rcnb);
+       }
+
+       return ret;
+}
+EXPORT_SYMBOL(devm_register_reboot_notifier);
+
 /*
  *     Notifier list for kernel code which wants to be called
  *     to restart the system.