[20/86] kernel/notifier.c: remove notifier_chain_cond_register()

Commit Message

Andrew Morton Dec. 5, 2019, 12:50 a.m. UTC

From: Xiaoming Ni <[e-mail]>
Subject: kernel/notifier.c: remove notifier_chain_cond_register()

The only difference between notifier_chain_cond_register() and
notifier_chain_register() is the lack of warning hints for duplicate
registrations.  Use notifier_chain_register() instead of
notifier_chain_cond_register() to avoid duplicate code

Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Xiaoming Ni <[e-mail]>
Reviewed-by: Andrew Morton <[e-mail]>
Cc: Alan Stern <[e-mail]>
Cc: Alexey Dobriyan <[e-mail]>
Cc: Andy Lutomirski <[e-mail]>
Cc: Anna Schumaker <[e-mail]>
Cc: Arjan van de Ven <[e-mail]>
Cc: Chuck Lever <[e-mail]>
Cc: David S. Miller <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: J. Bruce Fields <[e-mail]>
Cc: Jeff Layton <[e-mail]>
Cc: Nadia Derbey <[e-mail]>
Cc: "Paul E. McKenney" <[e-mail]>
Cc: Sam Protsenko <[e-mail]>
Cc: Thomas Gleixner <[e-mail]>
Cc: Trond Myklebust <[e-mail]>
Cc: Vasily Averin <[e-mail]>
Cc: Viresh Kumar <[e-mail]>
Cc: YueHaibing <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 kernel/notifier.c |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

Patch

--- a/kernel/notifier.c~kernel-notifierc-remove-notifier_chain_cond_register
+++ a/kernel/notifier.c
@@ -36,21 +36,6 @@  static int notifier_chain_register(struc
 	return 0;
 }
 
-static int notifier_chain_cond_register(struct notifier_block **nl,
-		struct notifier_block *n)
-{
-	while ((*nl) != NULL) {
-		if ((*nl) == n)
-			return 0;
-		if (n->priority > (*nl)->priority)
-			break;
-		nl = &((*nl)->next);
-	}
-	n->next = *nl;
-	rcu_assign_pointer(*nl, n);
-	return 0;
-}
-
 static int notifier_chain_unregister(struct notifier_block **nl,
 		struct notifier_block *n)
 {
@@ -252,7 +237,7 @@  int blocking_notifier_chain_cond_registe
 	int ret;
 
 	down_write(&nh->rwsem);
-	ret = notifier_chain_cond_register(&nh->head, n);
+	ret = notifier_chain_register(&nh->head, n);
 	up_write(&nh->rwsem);
 	return ret;
 }