[svn-commits] fjoe: freebsd/trunk r9172 - in /freebsd/trunk: drivers/dahdi/wctc4xxp/ freebs...

[SVN commits to the Digium repositories]

Author: fjoe
Date: Fri Aug 20 04:52:18 2010
New Revision: 9172

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9172
Log:
Reduce a number of #ifdef __FreeBSD__: del_timer() and del_timer_sync() should return int.

Modified:
    freebsd/trunk/drivers/dahdi/wctc4xxp/base.c
    freebsd/trunk/freebsd/dahdi/bsd-compat.c
    freebsd/trunk/include/dahdi/compat/bsd.h

Modified: freebsd/trunk/drivers/dahdi/wctc4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=9172&r1=9171&r2=9172
==============================================================================
--- freebsd/trunk/drivers/dahdi/wctc4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wctc4xxp/base.c Fri Aug 20 04:52:18 2010
@@ -4012,16 +4012,12 @@
 #endif
 
 	set_bit(DTE_SHUTDOWN, &wc->flags);
-#if !defined(__FreeBSD__)
 	if (del_timer_sync(&wc->watchdog))
-#endif
 		del_timer_sync(&wc->watchdog);
 
 	/* This should already be stopped, but it doesn't hurt to make sure. */
 	clear_bit(DTE_POLLING, &wc->flags);
-#if !defined(__FreeBSD__)
 	if (del_timer_sync(&wc->polling))
-#endif
 		del_timer_sync(&wc->polling);
 
 #ifndef WITHOUT_NETDEV

Modified: freebsd/trunk/freebsd/dahdi/bsd-compat.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/freebsd/dahdi/bsd-compat.c?view=diff&rev=9172&r1=9171&r2=9172
==============================================================================
--- freebsd/trunk/freebsd/dahdi/bsd-compat.c (original)
+++ freebsd/trunk/freebsd/dahdi/bsd-compat.c Fri Aug 20 04:52:18 2010
@@ -149,7 +149,7 @@
 	mod_timer(t, t->expires);
 }
 
-void
+int
 del_timer_sync(struct timer_list *t)
 {
 	mtx_lock_spin(&t->mtx);
@@ -157,12 +157,14 @@
 	mtx_unlock_spin(&t->mtx);
 
 	mtx_destroy(&t->mtx);
-}
-
-void
+	return 0;
+}
+
+int
 del_timer(struct timer_list *t)
 {
 	del_timer_sync(t);
+	return 0;
 }
 
 /*

Modified: freebsd/trunk/include/dahdi/compat/bsd.h
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/include/dahdi/compat/bsd.h?view=diff&rev=9172&r1=9171&r2=9172
==============================================================================
--- freebsd/trunk/include/dahdi/compat/bsd.h (original)
+++ freebsd/trunk/include/dahdi/compat/bsd.h Fri Aug 20 04:52:18 2010
@@ -236,8 +236,8 @@
 void setup_timer(struct timer_list *t, void (*function)(unsigned long), unsigned long data);
 void mod_timer(struct timer_list *t, unsigned long expires);
 void add_timer(struct timer_list *t);
-void del_timer(struct timer_list *t);
-void del_timer_sync(struct timer_list *t);
+int del_timer(struct timer_list *t);
+int del_timer_sync(struct timer_list *t);
 
 /*
  * Completion API