|
|
|
@ -53,10 +53,6 @@
|
|
|
|
|
#include <linux/ktime.h>
|
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
|
|
|
|
|
#if defined(HAVE_UNLOCKED_IOCTL) && defined(CONFIG_BKL)
|
|
|
|
|
#include <linux/smp_lock.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <linux/ppp_defs.h>
|
|
|
|
|
|
|
|
|
|
#include <asm/atomic.h>
|
|
|
|
@ -4069,14 +4065,6 @@ dahdi_timer_unlocked_ioctl(struct file *file, unsigned int cmd,
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifndef HAVE_UNLOCKED_IOCTL
|
|
|
|
|
static int dahdi_timer_ioctl(struct inode *inode, struct file *file,
|
|
|
|
|
unsigned int cmd, unsigned long data)
|
|
|
|
|
{
|
|
|
|
|
return dahdi_timer_unlocked_ioctl(file, cmd, data);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static int dahdi_ioctl_getgains(struct file *file, unsigned long data)
|
|
|
|
|
{
|
|
|
|
|
int res = 0;
|
|
|
|
@ -7011,14 +6999,6 @@ exit:
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifndef HAVE_UNLOCKED_IOCTL
|
|
|
|
|
static int dahdi_ioctl(struct inode *inode, struct file *file,
|
|
|
|
|
unsigned int cmd, unsigned long data)
|
|
|
|
|
{
|
|
|
|
|
return dahdi_unlocked_ioctl(file, cmd, data);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* _get_next_channo - Return the next taken channel number from the span list.
|
|
|
|
|
* @span: The span with which to start the search.
|
|
|
|
@ -10272,11 +10252,7 @@ static const struct file_operations dahdi_fops = {
|
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
|
.open = dahdi_open,
|
|
|
|
|
.release = dahdi_release,
|
|
|
|
|
#ifdef HAVE_UNLOCKED_IOCTL
|
|
|
|
|
.unlocked_ioctl = dahdi_unlocked_ioctl,
|
|
|
|
|
#else
|
|
|
|
|
.ioctl = dahdi_ioctl,
|
|
|
|
|
#endif
|
|
|
|
|
.poll = dahdi_poll,
|
|
|
|
|
.read = dahdi_no_read,
|
|
|
|
|
.write = dahdi_no_write,
|
|
|
|
@ -10285,11 +10261,7 @@ static const struct file_operations dahdi_fops = {
|
|
|
|
|
static const struct file_operations dahdi_timer_fops = {
|
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
|
.release = dahdi_timer_release,
|
|
|
|
|
#ifdef HAVE_UNLOCKED_IOCTL
|
|
|
|
|
.unlocked_ioctl = dahdi_timer_unlocked_ioctl,
|
|
|
|
|
#else
|
|
|
|
|
.ioctl = dahdi_timer_ioctl,
|
|
|
|
|
#endif
|
|
|
|
|
.poll = dahdi_timer_poll,
|
|
|
|
|
.read = dahdi_no_read,
|
|
|
|
|
.write = dahdi_no_write,
|
|
|
|
@ -10352,21 +10324,9 @@ nodev_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long data)
|
|
|
|
|
return nodev_common("ioctl");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifndef HAVE_UNLOCKED_IOCTL
|
|
|
|
|
static int nodev_ioctl(struct inode *inode, struct file *file,
|
|
|
|
|
unsigned int cmd, unsigned long data)
|
|
|
|
|
{
|
|
|
|
|
return nodev_unlocked_ioctl(file, cmd, data);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static const struct file_operations nodev_fops = {
|
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
|
#ifdef HAVE_UNLOCKED_IOCTL
|
|
|
|
|
.unlocked_ioctl = nodev_unlocked_ioctl,
|
|
|
|
|
#else
|
|
|
|
|
.ioctl = nodev_ioctl,
|
|
|
|
|
#endif
|
|
|
|
|
.read = nodev_chan_read,
|
|
|
|
|
.write = nodev_chan_write,
|
|
|
|
|
.poll = nodev_chan_poll,
|
|
|
|
@ -10376,11 +10336,7 @@ static const struct file_operations dahdi_chan_fops = {
|
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
|
.open = dahdi_open,
|
|
|
|
|
.release = dahdi_release,
|
|
|
|
|
#ifdef HAVE_UNLOCKED_IOCTL
|
|
|
|
|
.unlocked_ioctl = dahdi_unlocked_ioctl,
|
|
|
|
|
#else
|
|
|
|
|
.ioctl = dahdi_ioctl,
|
|
|
|
|
#endif
|
|
|
|
|
.read = dahdi_chan_read,
|
|
|
|
|
.write = dahdi_chan_write,
|
|
|
|
|
.poll = dahdi_chan_poll,
|
|
|
|
|