[svn-commits] tzafrir: linux/trunk r5132 - /linux/trunk/drivers/dahdi/xpp/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Oct 27 10:57:44 2008
New Revision: 5132

URL: http://svn.digium.com/view/dahdi?view=rev&rev=5132
Log:
xpp: remove an unused manual reference count field.

Modified:
    linux/trunk/drivers/dahdi/xpp/xbus-core.c
    linux/trunk/drivers/dahdi/xpp/xbus-core.h
    linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c

Modified: linux/trunk/drivers/dahdi/xpp/xbus-core.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/xbus-core.c?view=diff&rev=5132&r1=5131&r2=5132
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xbus-core.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xbus-core.c Mon Oct 27 10:57:44 2008
@@ -663,7 +663,6 @@
 	xpd->xbus_idx = xpd_num;
 	xbus->xpds[xpd_num] = xpd;
 	xpd->xbus = xbus;
-	atomic_inc(&xbus->xbus_ref_count);
 	atomic_inc(&xbus->num_xpds);
 	spin_unlock_irqrestore(&xbus->lock, flags);
 	/* Must be done out of atomic context */
@@ -1224,9 +1223,6 @@
 	worker_destroy(xbus->worker);
 	XBUS_DBG(DEVICES, xbus, "Deactivated refcount_xbus=%d\n",
 		refcount_xbus(xbus));
-	if(atomic_dec_and_test(&xbus->xbus_ref_count)) {
-		XBUS_DBG(DEVICES, xbus, "%s: Last ref to xbus. Removing\n", __FUNCTION__);
-	}
 	xbus_sysfs_remove(xbus);	/* Device-Model */
 }
 
@@ -1325,7 +1321,6 @@
 	XBUS_DBG(DEVICES, xbus, "\n");
 	transport_init(xbus, ops, max_send_size, priv);
 	spin_lock_init(&xbus->lock);
-	atomic_set(&xbus->xbus_ref_count, 1);	/* a single ref */
 	init_waitqueue_head(&xbus->command_queue_empty);
 	init_timer(&xbus->command_timer);
 	init_MUTEX(&xbus->in_worker);
@@ -1457,9 +1452,6 @@
 			xbus->label,
 			(!XBUS_IS(xbus, DISCONNECTED)) ? "connected" : "missing"
 		      );
-	len += sprintf(page + len, "\nxbus_ref_count=%d\n",
-			atomic_read(&xbus->xbus_ref_count)
-			);
 	len += xbus_fill_proc_queue(page + len, &xbus->send_pool);
 	len += xbus_fill_proc_queue(page + len, &xbus->receive_pool);
 	len += xbus_fill_proc_queue(page + len, &xbus->command_queue);

Modified: linux/trunk/drivers/dahdi/xpp/xbus-core.h
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/xbus-core.h?view=diff&rev=5132&r1=5131&r2=5132
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xbus-core.h (original)
+++ linux/trunk/drivers/dahdi/xpp/xbus-core.h Mon Oct 27 10:57:44 2008
@@ -199,7 +199,6 @@
 #define	dev_to_xbus(dev)	container_of(dev, struct xbus, astribank)
 
 	spinlock_t		lock;
-	atomic_t		xbus_ref_count;	/* How many need this struct? */
 
 	/* PCM metrics */
 	struct timeval		last_tx_sync;

Modified: linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c?view=diff&rev=5132&r1=5131&r2=5132
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c Mon Oct 27 10:57:44 2008
@@ -594,9 +594,6 @@
 	dahdi_unregister_xpd(xpd);
 	CALL_XMETHOD(card_remove, xbus, xpd);
 	xpd_free(xpd);
-	if(atomic_dec_and_test(&xbus->xbus_ref_count)) {
-		XBUS_DBG(DEVICES, xbus, "%s: Last ref to xbus. Removing\n", __FUNCTION__);
-	}
 }
 
 void update_xpd_status(xpd_t *xpd, int alarm_flag)