IB/mlx4: Follow mirror sequence of device add during device removal

[linux.git] / kernel / notifier.c

diff --git a/kernel/notifier.c b/kernel/notifier.c
index d9f5081d578d75a9bf562b970d23f8fa8c878599..63d7501ac638b5f8424ce10482682564a81b6cb2 100644 (file)
--- a/kernel/notifier.c
+++ b/kernel/notifier.c
@@ -23,22 +23,10 @@ static int notifier_chain_register(struct notifier_block **nl,
                struct notifier_block *n)
 {
        while ((*nl) != NULL) {
-               WARN_ONCE(((*nl) == n), "double register detected");
-               if (n->priority > (*nl)->priority)
-                       break;
-               nl = &((*nl)->next);
-       }
-       n->next = *nl;
-       rcu_assign_pointer(*nl, n);
-       return 0;
-}
-
-static int notifier_chain_cond_register(struct notifier_block **nl,
-               struct notifier_block *n)
-{
-       while ((*nl) != NULL) {
-               if ((*nl) == n)
+               if (unlikely((*nl) == n)) {
+                       WARN(1, "double register detected");
                        return 0;
+               }
                if (n->priority > (*nl)->priority)
                        break;
                nl = &((*nl)->next);
@@ -232,29 +220,6 @@ int blocking_notifier_chain_register(struct blocking_notifier_head *nh,
 }
 EXPORT_SYMBOL_GPL(blocking_notifier_chain_register);
 
-/**
- *     blocking_notifier_chain_cond_register - Cond add notifier to a blocking notifier chain
- *     @nh: Pointer to head of the blocking notifier chain
- *     @n: New entry in notifier chain
- *
- *     Adds a notifier to a blocking notifier chain, only if not already
- *     present in the chain.
- *     Must be called in process context.
- *
- *     Currently always returns zero.
- */
-int blocking_notifier_chain_cond_register(struct blocking_notifier_head *nh,
-               struct notifier_block *n)
-{
-       int ret;
-
-       down_write(&nh->rwsem);
-       ret = notifier_chain_cond_register(&nh->head, n);
-       up_write(&nh->rwsem);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(blocking_notifier_chain_cond_register);
-
 /**
  *     blocking_notifier_chain_unregister - Remove notifier from a blocking notifier chain
  *     @nh: Pointer to head of the blocking notifier chain