From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Wed, 26 Mar 2014 21:33:40 +0000 (+0100)
Subject: atm: replace del_timer by del_timer_sync
X-Git-Tag: v3.15-rc1~113^2~59
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=84275593ac8531fc57f8b0ebb8a761bf377b5519;p=~emulex%2Finfiniband.git

atm: replace del_timer by del_timer_sync

Use del_timer_sync to ensure that the timer is stopped on all CPUs before
the driver exists.

This change was suggested by Thomas Gleixner.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r@
declarer name module_exit;
identifier ex;
@@

module_exit(ex);

@@
identifier r.ex;
@@

ex(...) {
  <...
- del_timer
+ del_timer_sync
    (...)
  ...>
}
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index b71ff6b234f..91dc58f1124 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -1492,7 +1492,7 @@ static void __exit atm_mpoa_cleanup(void)
 
 	mpc_proc_clean();
 
-	del_timer(&mpc_timer);
+	del_timer_sync(&mpc_timer);
 	unregister_netdevice_notifier(&mpoa_notifier);
 	deregister_atm_ioctl(&atm_ioctl_ops);