FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Remove remaining #if 0 locations from dahdi-base.

Browse Source 
Dead code elimination.

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

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9410 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2010-09-24 22:44:49 +00:00
parent 7a83fe8e19
commit 41825e7c32
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/dahdi/dahdi-base.c
View File

@ -2997,18 +2997,6 @@ static int dahdi_open(struct inode *inode, struct file *file)
return dahdi_specchan_open(file); 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) static int dahdi_set_default_zone(int defzone)
{ {
if ((defzone < 0) || (defzone >= DAHDI_TONE_ZONE_MAX)) if ((defzone < 0) || (defzone >= DAHDI_TONE_ZONE_MAX))
@ -3494,20 +3482,6 @@ static int dahdi_release(struct inode *inode, struct file *file)
return dahdi_specchan_release(file); 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 * dahdi_alarm_channel() - notify userspace channel is (not) in alarm
* @chan: the DAHDI channel * @chan: the DAHDI channel
@ -5949,10 +5923,6 @@ static int dahdi_chan_ioctl(struct file *file, unsigned int cmd, unsigned long d
spin_unlock_irqrestore(&chan->lock, flags); spin_unlock_irqrestore(&chan->lock, flags);
if (file->f_flags & O_NONBLOCK) if (file->f_flags & O_NONBLOCK)
return -EINPROGRESS; return -EINPROGRESS;
#if 0
rv = schluffen(&chan->txstateq);
if (rv) return rv;
#endif
break; break;
case DAHDI_WINK: case DAHDI_WINK:
spin_lock_irqsave(&chan->lock, flags); spin_lock_irqsave(&chan->lock, flags);
@ -7369,9 +7339,6 @@ static inline void __dahdi_ec_chunk(struct dahdi_chan *ss, unsigned char *rxchun
if ((ss->ec_state->status.mode == ECHO_MODE_TRAINING) && if ((ss->ec_state->status.mode == ECHO_MODE_TRAINING) &&
(ss->ec_state->ops->echocan_traintap)) { (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 (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; ss->ec_state->status.mode = ECHO_MODE_ACTIVE;
} }
} }
@ -7993,10 +7960,6 @@ that the waitqueue is empty. */
/* Notify the receiver... */ /* Notify the receiver... */
__qevent(ss->master, abort); __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 */ } else /* No place to receive -- drop on the floor */
break; break;