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

dahdi: dahdi_specchan_open also does not need the unit parameter.

Browse Source 
Review: https://reviewboard.asterisk.org/r/905/

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9372 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell
2010-09-20 20:33:47 +00:00
parent c54662d799
commit 72a6c95ac1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2776,10 +2776,10 @@ static int dahdi_timer_release(struct file *file)
return 0;
}
static int dahdi_specchan_open(struct file *file, int unit)
static int dahdi_specchan_open(struct file *file)
{
int res = 0;
struct dahdi_chan *const chan = chans[unit];
struct dahdi_chan *const chan = chan_from_file(file);
if (chan && chan->sig) {
/* Make sure we're not already open, a net device, or a slave device */
@@ -2936,12 +2936,12 @@ static int dahdi_open(struct inode *inode, struct file *file)
chan = dahdi_alloc_pseudo();
if (chan) {
file->private_data = chan;
return dahdi_specchan_open(file, chan->channo);
return dahdi_specchan_open(file);
} else {
return -ENXIO;
}
}
return dahdi_specchan_open(file, unit);
return dahdi_specchan_open(file);
}
#if 0
@@ -6044,7 +6044,8 @@ static int dahdi_prechan_ioctl(struct file *file, unsigned int cmd, unsigned lon
return -EINVAL;
if (channo > DAHDI_MAX_CHANNELS)
return -EINVAL;
res = dahdi_specchan_open(file, channo);
file->private_data = chans[channo];
res = dahdi_specchan_open(file);
if (!res) {
/* Setup the pointer for future stuff */
chan = chans[channo];