[svn-commits] fjoe: freebsd/trunk r9187 - /freebsd/trunk/drivers/dahdi/wcte12xp/

[SVN commits to the Digium repositories]

Author: fjoe
Date: Tue Aug 24 09:43:27 2010
New Revision: 9187

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9187
Log:
- Do not defined ifacelock and ifaces
- Do destroy_completion() in correct place

Modified:
    freebsd/trunk/drivers/dahdi/wcte12xp/base.c
    freebsd/trunk/drivers/dahdi/wcte12xp/wcte12xp.h

Modified: freebsd/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=9187&r1=9186&r2=9187
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wcte12xp/base.c Tue Aug 24 09:43:27 2010
@@ -99,13 +99,6 @@
 	.echocan_free = echocan_free,
 };
 
-#if defined(__FreeBSD__)
-DEFINE_SPINLOCK(ifacelock);
-#else
-static struct t1 *ifaces[WC_MAX_IFACES];
-spinlock_t ifacelock = SPIN_LOCK_UNLOCKED;
-#endif /* !__FreeBSD__ */
-
 struct t1_desc {
 	const char *name;
 };
@@ -131,6 +124,7 @@
 
 static void free_cmd(struct t1 *wc, struct command *cmd)
 {
+	destroy_completion(&cmd->complete);
 	uma_zfree(cmd_cache, cmd);
 }
 #else /* !__FreeBSD__ */
@@ -154,7 +148,6 @@
 
 static void free_cmd(struct t1 *wc, struct command *cmd)
 {
-	destroy_completion(&cmd->complete);
 	kmem_cache_free(cmd_cache, cmd);
 }
 #endif /* !__FreeBSD__ */
@@ -2485,7 +2478,7 @@
 static int
 te12xp_device_probe(device_t dev)
 {
-        struct pci_device_id *id;
+	struct pci_device_id *id;
 	struct t1_desc *wd;
 
 	id = dahdi_pci_device_id_lookup(dev, te12xp_pci_tbl);

Modified: freebsd/trunk/drivers/dahdi/wcte12xp/wcte12xp.h
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcte12xp/wcte12xp.h?view=diff&rev=9187&r1=9186&r2=9187
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcte12xp/wcte12xp.h (original)
+++ freebsd/trunk/drivers/dahdi/wcte12xp/wcte12xp.h Tue Aug 24 09:43:27 2010
@@ -76,8 +76,6 @@
 
 #define TYPE_T1	1
 #define TYPE_E1	2
-
-extern spinlock_t ifacelock;
 
 struct command {
 	struct list_head node;