Skip to content

Commit

Permalink
isdn: replace del_timer by del_timer_sync
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Julia Lawall authored and David S. Miller committed Mar 27, 2014
1 parent a0b8486 commit 0c295e4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/isdn/act2000/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ static void __exit act2000_exit(void)
act2000_card *last;
while (card) {
unregister_card(card);
del_timer(&card->ptimer);
del_timer_sync(&card->ptimer);
card = card->next;
}
card = cards;
Expand Down
2 changes: 1 addition & 1 deletion drivers/isdn/i4l/isdn_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -2381,7 +2381,7 @@ static void __exit isdn_exit(void)
}
isdn_tty_exit();
unregister_chrdev(ISDN_MAJOR, "isdn");
del_timer(&dev->timer);
del_timer_sync(&dev->timer);
/* call vfree with interrupts enabled, else it will hang */
vfree(dev);
printk(KERN_NOTICE "ISDN-subsystem unloaded\n");
Expand Down
4 changes: 2 additions & 2 deletions drivers/isdn/sc/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@ static void __exit sc_exit(void)
/*
* kill the timers
*/
del_timer(&(sc_adapter[i]->reset_timer));
del_timer(&(sc_adapter[i]->stat_timer));
del_timer_sync(&(sc_adapter[i]->reset_timer));
del_timer_sync(&(sc_adapter[i]->stat_timer));

/*
* Tell I4L we're toast
Expand Down

0 comments on commit 0c295e4

Please sign in to comment.