[svn-commits] sruffell: linux/trunk r9410 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Sep 24 17:44:49 2010
New Revision: 9410

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9410
Log:
dahdi: Remove remaining #if 0 locations from dahdi-base.

Dead code elimination.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Kinsey Moore <kmoore at digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Review: https://reviewboard.asterisk.org/r/940/

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=9410&r1=9409&r2=9410
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Fri Sep 24 17:44:49 2010
@@ -2996,18 +2996,6 @@
 	}
 	return dahdi_specchan_open(file);
 }
-
-#if 0
-static int dahdi_open(struct file *file)
-{
-	int res;
-	unsigned long flags;
-	spin_lock_irqsave(&bigzaplock, flags);
-	res = __dahdi_open(file);
-	spin_unlock_irqrestore(&bigzaplock, flags);
-	return res;
-}
-#endif
 
 static int dahdi_set_default_zone(int defzone)
 {
@@ -3493,20 +3481,6 @@
 	}
 	return dahdi_specchan_release(file);
 }
-
-#if 0
-static int dahdi_release(struct inode *inode, struct file *file)
-{
-	/* Lock the big zap lock when handling a release */
-	unsigned long flags;
-	int res;
-	spin_lock_irqsave(&bigzaplock, flags);
-	res = __dahdi_release(file);
-	spin_unlock_irqrestore(&bigzaplock, flags);
-	return res;
-}
-#endif
-
 
 /**
  * dahdi_alarm_channel() - notify userspace channel is (not) in alarm
@@ -5949,10 +5923,6 @@
 				spin_unlock_irqrestore(&chan->lock, flags);
 				if (file->f_flags & O_NONBLOCK)
 					return -EINPROGRESS;
-#if 0
-				rv = schluffen(&chan->txstateq);
-				if (rv) return rv;
-#endif
 				break;
 			case DAHDI_WINK:
 				spin_lock_irqsave(&chan->lock, flags);
@@ -7369,9 +7339,6 @@
 				if ((ss->ec_state->status.mode == ECHO_MODE_TRAINING) &&
 				    (ss->ec_state->ops->echocan_traintap)) {
 					if (ss->ec_state->ops->echocan_traintap(ss->ec_state, ss->ec_state->status.last_train_tap++, rxlin)) {
-#if 0
-						module_printk(KERN_NOTICE, "Finished training (%d taps trained)!\n", ss->ec_state->status.last_train_tap);
-#endif
 						ss->ec_state->status.mode = ECHO_MODE_ACTIVE;
 					}
 				}
@@ -7993,10 +7960,6 @@
 						/* Notify the receiver... */
 						__qevent(ss->master, abort);
 					}
-#if 0
-				module_printk(KERN_NOTICE, "torintr_receive: Aborted %d bytes of frame on %d\n", amt, ss->master);
-#endif
-
 			}
 		} else /* No place to receive -- drop on the floor */
 			break;